chef 16.2.44 → 16.4.35

Sign up to get free protection for your applications and to get access to all the features.
Files changed (385) hide show
  1. checksums.yaml +4 -4
  2. data/Gemfile +4 -4
  3. data/Rakefile +3 -16
  4. data/chef-universal-mingw32.gemspec +2 -3
  5. data/chef.gemspec +4 -3
  6. data/lib/chef/action_collection.rb +4 -0
  7. data/lib/chef/api_client/registration.rb +8 -8
  8. data/lib/chef/application.rb +18 -1
  9. data/lib/chef/application/apply.rb +6 -5
  10. data/lib/chef/application/base.rb +2 -0
  11. data/lib/chef/application/client.rb +3 -0
  12. data/lib/chef/application/windows_service.rb +27 -27
  13. data/lib/chef/{whitelist.rb → attribute_allowlist.rb} +11 -11
  14. data/lib/chef/{blacklist.rb → attribute_blocklist.rb} +9 -9
  15. data/lib/chef/chef_class.rb +0 -1
  16. data/lib/chef/chef_fs/chef_fs_data_store.rb +54 -54
  17. data/lib/chef/chef_fs/data_handler/organization_data_handler.rb +1 -2
  18. data/lib/chef/chef_fs/file_system/chef_server/acl_entry.rb +10 -10
  19. data/lib/chef/chef_fs/file_system/chef_server/cookbook_file.rb +2 -2
  20. data/lib/chef/chef_fs/file_system/chef_server/cookbooks_dir.rb +1 -5
  21. data/lib/chef/chef_fs/file_system/chef_server/organization_invites_entry.rb +8 -8
  22. data/lib/chef/chef_fs/file_system/chef_server/organization_members_entry.rb +8 -8
  23. data/lib/chef/chef_fs/file_system/repository/base_file.rb +1 -0
  24. data/lib/chef/chef_fs/file_system/repository/chef_repository_file_system_cookbook_dir.rb +2 -2
  25. data/lib/chef/chef_fs/file_system/repository/chef_repository_file_system_cookbook_entry.rb +1 -1
  26. data/lib/chef/chef_fs/file_system/repository/chef_repository_file_system_root_dir.rb +18 -18
  27. data/lib/chef/chef_fs/file_system/repository/directory.rb +1 -1
  28. data/lib/chef/chef_fs/file_system/repository/file_system_entry.rb +1 -1
  29. data/lib/chef/chef_fs/parallelizer/parallel_enumerable.rb +1 -1
  30. data/lib/chef/client.rb +14 -14
  31. data/lib/chef/cookbook/remote_file_vendor.rb +1 -3
  32. data/lib/chef/cookbook/syntax_check.rb +1 -2
  33. data/lib/chef/cookbook_loader.rb +15 -29
  34. data/lib/chef/data_bag.rb +1 -2
  35. data/lib/chef/data_collector/run_end_message.rb +11 -1
  36. data/lib/chef/deprecated.rb +8 -0
  37. data/lib/chef/digester.rb +3 -2
  38. data/lib/chef/dsl/platform_introspection.rb +9 -7
  39. data/lib/chef/encrypted_data_bag_item/decryptor.rb +1 -1
  40. data/lib/chef/environment.rb +3 -4
  41. data/lib/chef/exceptions.rb +4 -1
  42. data/lib/chef/file_access_control/windows.rb +2 -2
  43. data/lib/chef/file_content_management/deploy/mv_unix.rb +1 -1
  44. data/lib/chef/file_content_management/tempfile.rb +9 -9
  45. data/lib/chef/handler.rb +2 -0
  46. data/lib/chef/http.rb +12 -12
  47. data/lib/chef/http/authenticator.rb +3 -1
  48. data/lib/chef/json_compat.rb +1 -1
  49. data/lib/chef/knife.rb +4 -4
  50. data/lib/chef/knife/bootstrap.rb +18 -15
  51. data/lib/chef/knife/bootstrap/train_connector.rb +1 -0
  52. data/lib/chef/knife/config_get.rb +1 -0
  53. data/lib/chef/knife/config_list_profiles.rb +4 -1
  54. data/lib/chef/knife/config_use_profile.rb +15 -5
  55. data/lib/chef/knife/configure.rb +1 -1
  56. data/lib/chef/knife/cookbook_download.rb +1 -1
  57. data/lib/chef/knife/cookbook_metadata.rb +1 -1
  58. data/lib/chef/knife/cookbook_upload.rb +29 -37
  59. data/lib/chef/knife/core/bootstrap_context.rb +1 -1
  60. data/lib/chef/knife/core/gem_glob_loader.rb +1 -1
  61. data/lib/chef/knife/core/generic_presenter.rb +1 -1
  62. data/lib/chef/knife/core/hashed_command_loader.rb +3 -2
  63. data/lib/chef/knife/core/subcommand_loader.rb +20 -1
  64. data/lib/chef/knife/core/ui.rb +8 -2
  65. data/lib/chef/knife/core/windows_bootstrap_context.rb +33 -26
  66. data/lib/chef/knife/delete.rb +15 -15
  67. data/lib/chef/knife/exec.rb +2 -2
  68. data/lib/chef/knife/rehash.rb +3 -21
  69. data/lib/chef/knife/ssh.rb +11 -7
  70. data/lib/chef/knife/xargs.rb +19 -19
  71. data/lib/chef/knife/yaml_convert.rb +1 -1
  72. data/lib/chef/log.rb +7 -2
  73. data/lib/chef/mixin/checksum.rb +0 -1
  74. data/{spec/functional/resource/base.rb → lib/chef/mixin/chef_utils_wiring.rb} +24 -12
  75. data/lib/chef/mixin/deep_merge.rb +35 -6
  76. data/{spec/unit/log_spec.rb → lib/chef/mixin/default_paths.rb} +13 -5
  77. data/lib/chef/mixin/openssl_helper.rb +30 -6
  78. data/lib/chef/mixin/path_sanity.rb +5 -4
  79. data/lib/chef/mixin/shell_out.rb +4 -188
  80. data/lib/chef/mixin/template.rb +1 -0
  81. data/lib/chef/mixin/which.rb +6 -3
  82. data/lib/chef/mixins.rb +1 -0
  83. data/lib/chef/monkey_patches/webrick-utils.rb +10 -10
  84. data/lib/chef/node.rb +36 -12
  85. data/lib/chef/node/attribute.rb +2 -4
  86. data/lib/chef/node_map.rb +21 -18
  87. data/lib/chef/platform/service_helpers.rb +31 -28
  88. data/lib/chef/property.rb +1 -1
  89. data/lib/chef/provider/cron/unix.rb +0 -2
  90. data/lib/chef/provider/git.rb +17 -9
  91. data/lib/chef/provider/group.rb +0 -2
  92. data/lib/chef/provider/group/suse.rb +5 -5
  93. data/lib/chef/provider/ifconfig.rb +1 -4
  94. data/lib/chef/provider/mount.rb +0 -2
  95. data/lib/chef/provider/mount/solaris.rb +0 -1
  96. data/lib/chef/provider/package.rb +0 -2
  97. data/lib/chef/provider/package/rubygems.rb +1 -1
  98. data/lib/chef/provider/package/snap.rb +3 -4
  99. data/lib/chef/provider/package/windows.rb +9 -4
  100. data/lib/chef/provider/package/windows/registry_uninstall_entry.rb +9 -9
  101. data/lib/chef/provider/package/zypper.rb +0 -1
  102. data/lib/chef/provider/powershell_script.rb +21 -5
  103. data/lib/chef/provider/route.rb +1 -1
  104. data/lib/chef/provider/service.rb +2 -2
  105. data/lib/chef/provider/service/arch.rb +1 -1
  106. data/lib/chef/provider/service/debian.rb +1 -1
  107. data/lib/chef/provider/service/gentoo.rb +2 -2
  108. data/lib/chef/provider/service/macosx.rb +2 -2
  109. data/lib/chef/provider/service/openbsd.rb +1 -4
  110. data/lib/chef/provider/service/redhat.rb +2 -2
  111. data/lib/chef/provider/service/upstart.rb +1 -1
  112. data/lib/chef/provider/service/windows.rb +10 -10
  113. data/lib/chef/provider/systemd_unit.rb +0 -2
  114. data/lib/chef/provider/template/content.rb +1 -0
  115. data/lib/chef/provider/user/dscl.rb +2 -2
  116. data/lib/chef/provider/user/mac.rb +9 -9
  117. data/lib/chef/provider/windows_task.rb +0 -3
  118. data/lib/chef/provider/yum_repository.rb +1 -1
  119. data/lib/chef/provider/zypper_repository.rb +1 -2
  120. data/lib/chef/providers.rb +0 -1
  121. data/lib/chef/recipe.rb +1 -1
  122. data/lib/chef/resource.rb +9 -11
  123. data/lib/chef/resource/alternatives.rb +1 -1
  124. data/lib/chef/resource/apt_repository.rb +1 -10
  125. data/lib/chef/resource/build_essential.rb +2 -2
  126. data/lib/chef/resource/chef_client_scheduled_task.rb +1 -1
  127. data/lib/chef/resource/chef_client_systemd_timer.rb +2 -2
  128. data/lib/chef/resource/chef_gem.rb +57 -21
  129. data/lib/chef/resource/chef_vault_secret.rb +13 -13
  130. data/lib/chef/resource/chocolatey_feature.rb +1 -2
  131. data/lib/chef/resource/cron/cron_d.rb +1 -1
  132. data/lib/chef/resource/cron_access.rb +2 -2
  133. data/lib/chef/resource/dmg_package.rb +2 -2
  134. data/lib/chef/resource/execute.rb +4 -5
  135. data/lib/chef/resource/gem_package.rb +35 -2
  136. data/lib/chef/resource/homebrew_update.rb +2 -2
  137. data/lib/chef/resource/hostname.rb +18 -18
  138. data/lib/chef/resource/launchd.rb +1 -1
  139. data/lib/chef/resource/lwrp_base.rb +1 -0
  140. data/lib/chef/resource/macos_userdefaults.rb +176 -61
  141. data/lib/chef/resource/openssl_dhparam.rb +2 -0
  142. data/lib/chef/resource/openssl_ec_private_key.rb +2 -0
  143. data/lib/chef/resource/openssl_ec_public_key.rb +2 -0
  144. data/lib/chef/resource/openssl_rsa_private_key.rb +2 -0
  145. data/lib/chef/resource/openssl_rsa_public_key.rb +2 -0
  146. data/lib/chef/resource/openssl_x509_certificate.rb +35 -35
  147. data/lib/chef/resource/openssl_x509_crl.rb +3 -2
  148. data/lib/chef/resource/openssl_x509_request.rb +23 -20
  149. data/lib/chef/resource/osx_profile.rb +227 -5
  150. data/lib/chef/resource/powershell_package_source.rb +1 -1
  151. data/lib/chef/resource/powershell_script.rb +24 -30
  152. data/lib/chef/resource/service.rb +2 -2
  153. data/lib/chef/resource/ssh_known_hosts_entry.rb +16 -1
  154. data/lib/chef/resource/sudo.rb +31 -4
  155. data/lib/chef/resource/swap_file.rb +17 -0
  156. data/lib/chef/resource/sysctl.rb +5 -5
  157. data/lib/chef/resource/timezone.rb +15 -0
  158. data/lib/chef/resource/user_ulimit.rb +1 -1
  159. data/lib/chef/resource/windows_ad_join.rb +2 -0
  160. data/lib/chef/resource/windows_audit_policy.rb +3 -0
  161. data/lib/chef/resource/windows_auto_run.rb +2 -0
  162. data/lib/chef/resource/windows_certificate.rb +2 -0
  163. data/lib/chef/resource/windows_dfs_folder.rb +2 -0
  164. data/lib/chef/resource/windows_dfs_namespace.rb +2 -0
  165. data/lib/chef/resource/windows_dfs_server.rb +2 -0
  166. data/lib/chef/resource/windows_dns_record.rb +25 -5
  167. data/lib/chef/resource/windows_dns_zone.rb +12 -7
  168. data/lib/chef/resource/windows_feature.rb +2 -0
  169. data/lib/chef/resource/windows_feature_dism.rb +10 -0
  170. data/lib/chef/resource/windows_feature_powershell.rb +14 -2
  171. data/lib/chef/resource/windows_firewall_profile.rb +199 -0
  172. data/lib/chef/resource/windows_firewall_rule.rb +5 -3
  173. data/lib/chef/resource/windows_font.rb +3 -1
  174. data/lib/chef/resource/windows_pagefile.rb +4 -0
  175. data/lib/chef/resource/windows_printer.rb +17 -18
  176. data/lib/chef/resource/windows_printer_port.rb +14 -13
  177. data/lib/chef/resource/windows_security_policy.rb +52 -21
  178. data/lib/chef/resource/windows_share.rb +5 -3
  179. data/lib/chef/resource/windows_shortcut.rb +2 -0
  180. data/lib/chef/resource/windows_uac.rb +2 -0
  181. data/lib/chef/resource/windows_user_privilege.rb +27 -2
  182. data/lib/chef/resource/windows_workgroup.rb +2 -3
  183. data/lib/chef/resource_collection/stepable_iterator.rb +1 -2
  184. data/lib/chef/resource_inspector.rb +7 -1
  185. data/lib/chef/resources.rb +1 -0
  186. data/lib/chef/role.rb +3 -4
  187. data/lib/chef/run_context/cookbook_compiler.rb +20 -20
  188. data/lib/chef/run_status.rb +2 -6
  189. data/lib/chef/server_api_versions.rb +4 -0
  190. data/lib/chef/shell.rb +1 -1
  191. data/lib/chef/shell/shell_session.rb +2 -0
  192. data/lib/chef/util/backup.rb +1 -1
  193. data/lib/chef/util/diff.rb +11 -12
  194. data/lib/chef/util/powershell/cmdlet.rb +1 -1
  195. data/lib/chef/version.rb +2 -2
  196. data/lib/chef/win32/file.rb +2 -2
  197. data/lib/chef/win32/file/version_info.rb +5 -5
  198. data/lib/chef/win32/registry.rb +1 -2
  199. data/spec/data/ssl/chef-rspec.cert +15 -15
  200. data/spec/functional/knife/configure_spec.rb +1 -1
  201. data/spec/functional/knife/ssh_spec.rb +5 -16
  202. data/spec/functional/resource/aix_service_spec.rb +9 -2
  203. data/spec/functional/resource/aixinit_service_spec.rb +8 -9
  204. data/spec/functional/resource/apt_package_spec.rb +0 -1
  205. data/spec/functional/resource/bash_spec.rb +3 -2
  206. data/spec/functional/resource/bff_spec.rb +3 -3
  207. data/spec/functional/resource/chocolatey_package_spec.rb +4 -0
  208. data/spec/functional/resource/cookbook_file_spec.rb +1 -1
  209. data/spec/functional/resource/cron_spec.rb +10 -2
  210. data/spec/functional/resource/dnf_package_spec.rb +4 -1
  211. data/spec/functional/resource/dsc_resource_spec.rb +1 -1
  212. data/spec/functional/resource/dsc_script_spec.rb +0 -1
  213. data/spec/functional/resource/execute_spec.rb +1 -1
  214. data/spec/functional/resource/git_spec.rb +23 -1
  215. data/spec/functional/resource/group_spec.rb +21 -9
  216. data/spec/functional/resource/ifconfig_spec.rb +9 -1
  217. data/spec/functional/resource/insserv_spec.rb +7 -7
  218. data/spec/functional/resource/link_spec.rb +22 -25
  219. data/spec/functional/resource/mount_spec.rb +9 -1
  220. data/spec/functional/resource/msu_package_spec.rb +9 -3
  221. data/spec/functional/resource/powershell_script_spec.rb +8 -8
  222. data/spec/functional/resource/remote_file_spec.rb +7 -13
  223. data/spec/functional/resource/rpm_spec.rb +3 -3
  224. data/spec/functional/resource/timezone_spec.rb +2 -0
  225. data/spec/functional/resource/windows_certificate_spec.rb +3 -3
  226. data/spec/functional/resource/windows_font_spec.rb +49 -0
  227. data/spec/functional/resource/windows_package_spec.rb +0 -1
  228. data/spec/functional/resource/windows_path_spec.rb +4 -0
  229. data/spec/functional/resource/windows_security_policy_spec.rb +0 -4
  230. data/spec/functional/resource/windows_service_spec.rb +4 -0
  231. data/spec/functional/resource/windows_task_spec.rb +4 -3
  232. data/spec/functional/resource/windows_user_privilege_spec.rb +1 -2
  233. data/spec/functional/resource/yum_package_spec.rb +4 -1
  234. data/spec/functional/resource/zypper_package_spec.rb +4 -1
  235. data/spec/functional/run_lock_spec.rb +26 -25
  236. data/spec/functional/shell_spec.rb +5 -6
  237. data/spec/functional/util/powershell/cmdlet_spec.rb +1 -1
  238. data/spec/functional/version_spec.rb +1 -1
  239. data/spec/functional/win32/crypto_spec.rb +1 -1
  240. data/spec/functional/win32/registry_spec.rb +8 -8
  241. data/spec/functional/win32/service_manager_spec.rb +1 -1
  242. data/spec/integration/knife/common_options_spec.rb +12 -12
  243. data/spec/integration/knife/config_get_profile_spec.rb +69 -68
  244. data/spec/integration/knife/config_get_spec.rb +126 -125
  245. data/spec/integration/knife/config_list_profiles_spec.rb +181 -152
  246. data/spec/integration/knife/config_use_profile_spec.rb +115 -61
  247. data/spec/integration/knife/cookbook_upload_spec.rb +28 -1
  248. data/spec/integration/knife/data_bag_from_file_spec.rb +1 -1
  249. data/spec/integration/knife/diff_spec.rb +3 -1
  250. data/spec/integration/knife/download_spec.rb +3 -1
  251. data/spec/integration/knife/environment_from_file_spec.rb +1 -1
  252. data/spec/integration/knife/node_from_file_spec.rb +1 -1
  253. data/spec/integration/knife/role_from_file_spec.rb +1 -1
  254. data/spec/integration/knife/serve_spec.rb +5 -5
  255. data/spec/integration/knife/upload_spec.rb +3 -1
  256. data/spec/integration/recipes/accumulator_spec.rb +1 -1
  257. data/spec/integration/recipes/lwrp_inline_resources_spec.rb +2 -2
  258. data/spec/integration/recipes/lwrp_spec.rb +1 -1
  259. data/spec/integration/recipes/notifies_spec.rb +1 -1
  260. data/spec/integration/recipes/notifying_block_spec.rb +1 -1
  261. data/spec/integration/recipes/recipe_dsl_spec.rb +5 -1
  262. data/spec/integration/recipes/resource_converge_if_changed_spec.rb +2 -0
  263. data/spec/integration/recipes/resource_load_spec.rb +4 -2
  264. data/spec/integration/recipes/unified_mode_spec.rb +1 -1
  265. data/spec/integration/recipes/use_partial_spec.rb +1 -1
  266. data/spec/scripts/ssl-serve.rb +1 -1
  267. data/spec/spec_helper.rb +16 -10
  268. data/spec/support/chef_helpers.rb +1 -20
  269. data/spec/support/platform_helpers.rb +9 -11
  270. data/spec/support/platforms/win32/spec_service.rb +1 -1
  271. data/spec/support/shared/functional/directory_resource.rb +1 -1
  272. data/spec/support/shared/functional/execute_resource.rb +1 -1
  273. data/spec/support/shared/functional/file_resource.rb +20 -21
  274. data/spec/support/shared/functional/securable_resource.rb +1 -2
  275. data/spec/support/shared/functional/securable_resource_with_reporting.rb +0 -1
  276. data/spec/support/shared/functional/win32_service.rb +1 -1
  277. data/spec/support/shared/functional/windows_script.rb +5 -5
  278. data/spec/support/shared/integration/integration_helper.rb +22 -52
  279. data/spec/support/shared/integration/knife_support.rb +2 -9
  280. data/spec/support/shared/unit/application_dot_d.rb +0 -1
  281. data/spec/support/shared/unit/provider/file.rb +12 -8
  282. data/spec/support/shared/unit/script_resource.rb +6 -20
  283. data/spec/support/shared/unit/windows_script_resource.rb +15 -28
  284. data/spec/unit/application/solo_spec.rb +4 -2
  285. data/spec/unit/application_spec.rb +4 -2
  286. data/spec/unit/chef_fs/config_spec.rb +2 -2
  287. data/spec/unit/chef_fs/diff_spec.rb +8 -8
  288. data/spec/unit/chef_fs/file_system/operation_failed_error_spec.rb +2 -4
  289. data/spec/unit/chef_fs/{parallelizer.rb → parallelizer_spec.rb} +1 -1
  290. data/spec/unit/client_spec.rb +4 -1
  291. data/spec/unit/cookbook/gem_installer_spec.rb +2 -1
  292. data/spec/unit/cookbook/synchronizer_spec.rb +26 -24
  293. data/spec/unit/data_bag_spec.rb +6 -3
  294. data/spec/unit/data_collector_spec.rb +23 -1
  295. data/spec/unit/decorator_spec.rb +23 -23
  296. data/spec/unit/dsl/platform_introspection_spec.rb +1 -0
  297. data/spec/unit/environment_spec.rb +12 -8
  298. data/spec/unit/event_dispatch/dispatcher_spec.rb +3 -0
  299. data/spec/unit/guard_interpreter_spec.rb +1 -1
  300. data/spec/unit/http/api_versions_spec.rb +20 -2
  301. data/spec/unit/json_compat_spec.rb +1 -1
  302. data/spec/unit/knife/bootstrap_spec.rb +17 -20
  303. data/spec/unit/knife/cookbook_download_spec.rb +6 -6
  304. data/spec/unit/knife/cookbook_metadata_from_file_spec.rb +1 -1
  305. data/spec/unit/knife/cookbook_show_spec.rb +6 -7
  306. data/spec/unit/knife/cookbook_upload_spec.rb +7 -10
  307. data/spec/unit/knife/core/hashed_command_loader_spec.rb +3 -3
  308. data/spec/unit/knife/core/windows_bootstrap_context_spec.rb +21 -12
  309. data/spec/unit/knife/data_bag_edit_spec.rb +1 -1
  310. data/spec/unit/knife/supermarket_share_spec.rb +1 -1
  311. data/spec/unit/log/syslog_spec.rb +6 -10
  312. data/spec/unit/log/winevt_spec.rb +21 -13
  313. data/spec/unit/lwrp_spec.rb +9 -6
  314. data/spec/unit/mixin/{path_sanity_spec.rb → default_paths_spec.rb} +14 -14
  315. data/spec/unit/mixin/powershell_exec_spec.rb +1 -1
  316. data/spec/unit/mixin/powershell_out_spec.rb +2 -4
  317. data/spec/unit/mixin/powershell_type_coercions_spec.rb +1 -1
  318. data/spec/unit/mixin/securable_spec.rb +0 -1
  319. data/spec/unit/mixin/shell_out_spec.rb +25 -26
  320. data/spec/unit/mixin/subclass_directive_spec.rb +2 -2
  321. data/spec/unit/mixin/template_spec.rb +30 -30
  322. data/spec/unit/mixin/unformatter_spec.rb +2 -2
  323. data/spec/unit/mixin/uris_spec.rb +1 -1
  324. data/spec/unit/mixin/which.rb +8 -0
  325. data/spec/unit/mixin/windows_architecture_helper_spec.rb +4 -4
  326. data/spec/unit/node/immutable_collections_spec.rb +6 -2
  327. data/spec/unit/node_spec.rb +103 -16
  328. data/spec/unit/property_spec.rb +5 -5
  329. data/spec/unit/provider/batch_spec.rb +1 -1
  330. data/spec/unit/provider/cron/unix_spec.rb +1 -1
  331. data/spec/unit/provider/dsc_resource_spec.rb +22 -38
  332. data/spec/unit/provider/dsc_script_spec.rb +10 -10
  333. data/spec/unit/provider/execute_spec.rb +1 -8
  334. data/spec/unit/provider/git_spec.rb +3 -3
  335. data/spec/unit/provider/ifconfig_spec.rb +0 -1
  336. data/spec/unit/provider/mdadm_spec.rb +1 -3
  337. data/spec/unit/provider/package/dnf/python_helper_spec.rb +1 -1
  338. data/spec/unit/provider/package/openbsd_spec.rb +1 -1
  339. data/spec/unit/provider/package/pacman_spec.rb +17 -20
  340. data/spec/unit/provider/package/rubygems_spec.rb +5 -10
  341. data/spec/unit/provider/package/smartos_spec.rb +1 -1
  342. data/spec/unit/provider/package/windows/registry_uninstall_entry_spec.rb +3 -3
  343. data/spec/unit/provider/package/windows_spec.rb +30 -53
  344. data/spec/unit/provider/powershell_script_spec.rb +11 -4
  345. data/spec/unit/provider/remote_directory_spec.rb +9 -9
  346. data/spec/unit/provider/service/arch_service_spec.rb +3 -2
  347. data/spec/unit/provider/service/debian_service_spec.rb +1 -1
  348. data/spec/unit/provider/service/gentoo_service_spec.rb +7 -7
  349. data/spec/unit/provider/service/macosx_spec.rb +3 -3
  350. data/spec/unit/provider/service/redhat_spec.rb +3 -3
  351. data/spec/unit/provider/service/upstart_service_spec.rb +3 -3
  352. data/spec/unit/provider/service/windows_spec.rb +2 -6
  353. data/spec/unit/provider/systemd_unit_spec.rb +28 -24
  354. data/spec/unit/provider/user/dscl_spec.rb +2 -2
  355. data/spec/unit/provider/windows_env_spec.rb +5 -4
  356. data/spec/unit/provider_resolver_spec.rb +6 -6
  357. data/spec/unit/provider_spec.rb +1 -0
  358. data/spec/unit/resource/batch_spec.rb +6 -6
  359. data/spec/unit/resource/chef_client_cron_spec.rb +23 -7
  360. data/spec/unit/resource/chef_client_systemd_timer_spec.rb +7 -4
  361. data/spec/unit/resource/execute_spec.rb +123 -118
  362. data/spec/unit/resource/file/verification_spec.rb +2 -1
  363. data/spec/unit/resource/macos_user_defaults_spec.rb +103 -2
  364. data/spec/unit/resource/osx_profile_spec.rb +233 -0
  365. data/spec/unit/resource/powershell_script_spec.rb +11 -29
  366. data/spec/unit/resource/script_spec.rb +6 -1
  367. data/spec/unit/resource/windows_feature_powershell_spec.rb +30 -4
  368. data/spec/unit/resource/windows_firewall_profile_spec.rb +77 -0
  369. data/spec/unit/resource/windows_package_spec.rb +1 -0
  370. data/spec/unit/resource_reporter_spec.rb +1 -1
  371. data/spec/unit/resource_spec.rb +25 -8
  372. data/spec/unit/role_spec.rb +30 -28
  373. data/spec/unit/run_context/cookbook_compiler_spec.rb +1 -1
  374. data/spec/unit/run_lock_spec.rb +1 -1
  375. data/spec/unit/scan_access_control_spec.rb +1 -1
  376. data/spec/unit/server_api_spec.rb +43 -16
  377. data/spec/unit/util/backup_spec.rb +1 -1
  378. data/spec/unit/util/diff_spec.rb +1 -15
  379. data/spec/unit/util/powershell/ps_credential_spec.rb +2 -2
  380. data/spec/unit/util/selinux_spec.rb +2 -1
  381. data/spec/unit/win32/security_spec.rb +4 -3
  382. data/tasks/rspec.rb +1 -1
  383. metadata +45 -24
  384. data/lib/chef/provider/osx_profile.rb +0 -255
  385. data/spec/unit/provider/osx_profile_spec.rb +0 -255
@@ -22,170 +22,171 @@ describe "knife config get", :workstation do
22
22
  include KnifeSupport
23
23
 
24
24
  include_context "default config options"
25
- include_context "with a chef repo"
26
25
 
27
26
  let(:cmd_args) { [] }
28
27
 
29
- subject do
30
- cmd = knife("config", "get", *cmd_args, instance_filter: lambda { |instance|
31
- # Clear the stub set up in KnifeSupport.
32
- allow(File).to receive(:file?).and_call_original
33
- # Lies, damn lies, and config files. We need to allow normal config loading
34
- # behavior to be able to test stuff.
35
- instance.config.delete(:config_file)
36
- $__KNIFE_INTEGRATION_FAILSAFE_CHECK << " ole"
37
- })
38
- cmd.stdout
39
- end
28
+ when_the_repository("has a custom env") do
29
+ subject do
30
+ cmd = knife("config", "get", *cmd_args, instance_filter: lambda { |instance|
31
+ # Clear the stub set up in KnifeSupport.
32
+ allow(File).to receive(:file?).and_call_original
33
+ # Lies, damn lies, and config files. We need to allow normal config loading
34
+ # behavior to be able to test stuff.
35
+ instance.config.delete(:config_file)
36
+ $__KNIFE_INTEGRATION_FAILSAFE_CHECK << " ole"
37
+ })
38
+ cmd.stdout
39
+ end
40
40
 
41
- around do |ex|
42
- # Store and reset the value of some env vars.
43
- old_chef_home = ENV["CHEF_HOME"]
44
- old_knife_home = ENV["KNIFE_HOME"]
45
- old_home = ENV["HOME"]
46
- old_wd = Dir.pwd
47
- ChefConfig::PathHelper.per_tool_home_environment = "KNIFE_HOME"
48
- # Clear these out because they are cached permanently.
49
- ChefConfig::PathHelper.class_exec { remove_class_variable(:@@home_dir) }
50
- Chef::Knife::ConfigGet.reset_config_loader!
51
- begin
52
- ex.run
53
- ensure
54
- ENV["CHEF_HOME"] = old_chef_home
55
- ENV["KNIFE_HOME"] = old_knife_home
56
- ENV["HOME"] = old_home
57
- Dir.chdir(old_wd)
41
+ around do |ex|
42
+ # Store and reset the value of some env vars.
43
+ old_chef_home = ENV["CHEF_HOME"]
44
+ old_knife_home = ENV["KNIFE_HOME"]
45
+ old_home = ENV["HOME"]
46
+ old_wd = Dir.pwd
47
+ ChefConfig::PathHelper.per_tool_home_environment = "KNIFE_HOME"
48
+ # Clear these out because they are cached permanently.
49
+ ChefConfig::PathHelper.class_exec { remove_class_variable(:@@home_dir) }
50
+ Chef::Knife::ConfigGet.reset_config_loader!
51
+ begin
52
+ ex.run
53
+ ensure
54
+ ENV["CHEF_HOME"] = old_chef_home
55
+ ENV["KNIFE_HOME"] = old_knife_home
56
+ ENV["HOME"] = old_home
57
+ Dir.chdir(old_wd)
58
+ ENV[ChefUtils.windows? ? "CD" : "PWD"] = Dir.pwd
59
+ ChefConfig::PathHelper.per_tool_home_environment = nil
60
+ end
61
+ end
62
+
63
+ before do
64
+ # Always run from the temp folder. This can't be in the `around` block above
65
+ # because it has to run after the before set in the "with a chef repo" shared context.
66
+ directory("repo")
67
+ Dir.chdir(path_to("repo"))
58
68
  ENV[ChefUtils.windows? ? "CD" : "PWD"] = Dir.pwd
59
- ChefConfig::PathHelper.per_tool_home_environment = nil
69
+ ENV["HOME"] = path_to(".")
60
70
  end
61
- end
62
71
 
63
- before do
64
- # Always run from the temp folder. This can't be in the `around` block above
65
- # because it has to run after the before set in the "with a chef repo" shared context.
66
- directory("repo")
67
- Dir.chdir(path_to("repo"))
68
- ENV[ChefUtils.windows? ? "CD" : "PWD"] = Dir.pwd
69
- ENV["HOME"] = path_to(".")
70
- end
72
+ context "with a global knife.rb" do
73
+ before { file(".chef/knife.rb", "node_name 'one'\n") }
71
74
 
72
- context "with a global knife.rb" do
73
- before { file(".chef/knife.rb", "node_name 'one'\n") }
75
+ it { is_expected.to match(%r{^Loading from configuration file .*/#{File.basename(path_to("."))}/.chef/knife.rb$}) }
76
+ it { is_expected.to match(/^node_name:\s+one$/) }
77
+ end
74
78
 
75
- it { is_expected.to match(%r{^Loading from configuration file .*/#{File.basename(path_to("."))}/.chef/knife.rb$}) }
76
- it { is_expected.to match(/^node_name:\s+one$/) }
77
- end
79
+ context "with a repo knife.rb" do
80
+ before { file("repo/.chef/knife.rb", "node_name 'two'\n") }
78
81
 
79
- context "with a repo knife.rb" do
80
- before { file("repo/.chef/knife.rb", "node_name 'two'\n") }
82
+ it { is_expected.to match(%r{^Loading from configuration file .*/#{File.basename(path_to("."))}/repo/.chef/knife.rb$}) }
83
+ it { is_expected.to match(/^node_name:\s+two$/) }
84
+ end
81
85
 
82
- it { is_expected.to match(%r{^Loading from configuration file .*/#{File.basename(path_to("."))}/repo/.chef/knife.rb$}) }
83
- it { is_expected.to match(/^node_name:\s+two$/) }
84
- end
86
+ context "with both knife.rb" do
87
+ before do
88
+ file(".chef/knife.rb", "node_name 'one'\n")
89
+ file("repo/.chef/knife.rb", "node_name 'two'\n")
90
+ end
85
91
 
86
- context "with both knife.rb" do
87
- before do
88
- file(".chef/knife.rb", "node_name 'one'\n")
89
- file("repo/.chef/knife.rb", "node_name 'two'\n")
92
+ it { is_expected.to match(%r{^Loading from configuration file .*/#{File.basename(path_to("."))}/repo/.chef/knife.rb$}) }
93
+ it { is_expected.to match(/^node_name:\s+two$/) }
90
94
  end
91
95
 
92
- it { is_expected.to match(%r{^Loading from configuration file .*/#{File.basename(path_to("."))}/repo/.chef/knife.rb$}) }
93
- it { is_expected.to match(/^node_name:\s+two$/) }
94
- end
96
+ context "with a credentials file" do
97
+ before { file(".chef/credentials", "[default]\nclient_name = \"three\"\n") }
95
98
 
96
- context "with a credentials file" do
97
- before { file(".chef/credentials", "[default]\nclient_name = \"three\"\n") }
99
+ it { is_expected.to match(%r{^Loading from credentials file .*/#{File.basename(path_to("."))}/.chef/credentials$}) }
100
+ it { is_expected.to match(/^node_name:\s+three$/) }
101
+ end
98
102
 
99
- it { is_expected.to match(%r{^Loading from credentials file .*/#{File.basename(path_to("."))}/.chef/credentials$}) }
100
- it { is_expected.to match(/^node_name:\s+three$/) }
101
- end
103
+ context "with a credentials file and knife.rb" do
104
+ before do
105
+ file(".chef/knife.rb", "node_name 'one'\n")
106
+ file(".chef/credentials", "[default]\nclient_name = \"three\"\n")
107
+ end
102
108
 
103
- context "with a credentials file and knife.rb" do
104
- before do
105
- file(".chef/knife.rb", "node_name 'one'\n")
106
- file(".chef/credentials", "[default]\nclient_name = \"three\"\n")
109
+ it { is_expected.to match(%r{^Loading from configuration file .*/#{File.basename(path_to("."))}/.chef/knife.rb$}) }
110
+ it { is_expected.to match(%r{^Loading from credentials file .*/#{File.basename(path_to("."))}/.chef/credentials$}) }
111
+ it { is_expected.to match(/^node_name:\s+one$/) }
107
112
  end
108
113
 
109
- it { is_expected.to match(%r{^Loading from configuration file .*/#{File.basename(path_to("."))}/.chef/knife.rb$}) }
110
- it { is_expected.to match(%r{^Loading from credentials file .*/#{File.basename(path_to("."))}/.chef/credentials$}) }
111
- it { is_expected.to match(/^node_name:\s+one$/) }
112
- end
114
+ context "with a config dot d files" do
115
+ before { file(".chef/config.d/abc.rb", "node_name 'one'\n") }
113
116
 
114
- context "with a config dot d files" do
115
- before { file(".chef/config.d/abc.rb", "node_name 'one'\n") }
117
+ it { is_expected.to match(%r{^Loading from .d/ configuration file .*/#{File.basename(path_to("."))}/.chef/config.d/abc.rb$}) }
118
+ it { is_expected.to match(/^node_name:\s+one$/) }
119
+ end
116
120
 
117
- it { is_expected.to match(%r{^Loading from .d/ configuration file .*/#{File.basename(path_to("."))}/.chef/config.d/abc.rb$}) }
118
- it { is_expected.to match(/^node_name:\s+one$/) }
119
- end
121
+ context "with a credentials file and CHEF_HOME" do
122
+ before do
123
+ file(".chef/credentials", "[default]\nclient_name = \"three\"\n")
124
+ file("foo/.chef/credentials", "[default]\nclient_name = \"four\"\n")
125
+ ENV["CHEF_HOME"] = path_to("foo")
126
+ end
120
127
 
121
- context "with a credentials file and CHEF_HOME" do
122
- before do
123
- file(".chef/credentials", "[default]\nclient_name = \"three\"\n")
124
- file("foo/.chef/credentials", "[default]\nclient_name = \"four\"\n")
125
- ENV["CHEF_HOME"] = path_to("foo")
128
+ it { is_expected.to match(%r{^Loading from credentials file .*/#{File.basename(path_to("."))}/foo/.chef/credentials$}) }
129
+ it { is_expected.to match(/^node_name:\s+four$/) }
126
130
  end
127
131
 
128
- it { is_expected.to match(%r{^Loading from credentials file .*/#{File.basename(path_to("."))}/foo/.chef/credentials$}) }
129
- it { is_expected.to match(/^node_name:\s+four$/) }
130
- end
132
+ context "with a credentials file and KNIFE_HOME" do
133
+ before do
134
+ file(".chef/credentials", "[default]\nclient_name = \"three\"\n")
135
+ file("bar/.chef/credentials", "[default]\nclient_name = \"four\"\n")
136
+ ENV["KNIFE_HOME"] = path_to("bar")
137
+ end
131
138
 
132
- context "with a credentials file and KNIFE_HOME" do
133
- before do
134
- file(".chef/credentials", "[default]\nclient_name = \"three\"\n")
135
- file("bar/.chef/credentials", "[default]\nclient_name = \"four\"\n")
136
- ENV["KNIFE_HOME"] = path_to("bar")
139
+ it { is_expected.to match(%r{^Loading from credentials file .*/#{File.basename(path_to("."))}/bar/.chef/credentials$}) }
140
+ it { is_expected.to match(/^node_name:\s+four$/) }
137
141
  end
138
142
 
139
- it { is_expected.to match(%r{^Loading from credentials file .*/#{File.basename(path_to("."))}/bar/.chef/credentials$}) }
140
- it { is_expected.to match(/^node_name:\s+four$/) }
141
- end
142
-
143
- context "with single argument" do
144
- let(:cmd_args) { %w{node_name} }
145
- before { file(".chef/credentials", "[default]\nclient_name = \"three\"\n") }
143
+ context "with single argument" do
144
+ let(:cmd_args) { %w{node_name} }
145
+ before { file(".chef/credentials", "[default]\nclient_name = \"three\"\n") }
146
146
 
147
- it { is_expected.to match(/^node_name:\s+three\Z/) }
148
- end
147
+ it { is_expected.to match(/^node_name:\s+three\Z/) }
148
+ end
149
149
 
150
- context "with two arguments" do
151
- let(:cmd_args) { %w{node_name client_key} }
152
- before { file(".chef/credentials", "[default]\nclient_name = \"three\"\nclient_key = \"three.pem\"") }
150
+ context "with two arguments" do
151
+ let(:cmd_args) { %w{node_name client_key} }
152
+ before { file(".chef/credentials", "[default]\nclient_name = \"three\"\nclient_key = \"three.pem\"") }
153
153
 
154
- it { is_expected.to match(%r{^client_key:\s+\S*/.chef/three.pem\nnode_name:\s+three\Z}) }
155
- end
154
+ it { is_expected.to match(%r{^client_key:\s+\S*/.chef/three.pem\nnode_name:\s+three\Z}) }
155
+ end
156
156
 
157
- context "with a dotted argument" do
158
- let(:cmd_args) { %w{knife.ssh_user} }
159
- before { file(".chef/credentials", "[default]\nclient_name = \"three\"\n[default.knife]\nssh_user = \"foo\"\n") }
157
+ context "with a dotted argument" do
158
+ let(:cmd_args) { %w{knife.ssh_user} }
159
+ before { file(".chef/credentials", "[default]\nclient_name = \"three\"\n[default.knife]\nssh_user = \"foo\"\n") }
160
160
 
161
- it { is_expected.to match(/^knife.ssh_user:\s+foo\Z/) }
162
- end
161
+ it { is_expected.to match(/^knife.ssh_user:\s+foo\Z/) }
162
+ end
163
163
 
164
- context "with regex argument" do
165
- let(:cmd_args) { %w{/name/} }
166
- before { file(".chef/credentials", "[default]\nclient_name = \"three\"\n") }
164
+ context "with regex argument" do
165
+ let(:cmd_args) { %w{/name/} }
166
+ before { file(".chef/credentials", "[default]\nclient_name = \"three\"\n") }
167
167
 
168
- it { is_expected.to match(/^node_name:\s+three\Z/) }
169
- end
168
+ it { is_expected.to match(/^node_name:\s+three\Z/) }
169
+ end
170
170
 
171
- context "with --all" do
172
- let(:cmd_args) { %w{-a /key_contents/} }
173
- before { file(".chef/credentials", "[default]\nclient_name = \"three\"\n") }
171
+ context "with --all" do
172
+ let(:cmd_args) { %w{-a /key_contents/} }
173
+ before { file(".chef/credentials", "[default]\nclient_name = \"three\"\n") }
174
174
 
175
- it { is_expected.to match(/^client_key_contents:\s+\nvalidation_key_contents:\s+\Z/) }
176
- end
175
+ it { is_expected.to match(/^client_key_contents:\s+\nvalidation_key_contents:\s+\Z/) }
176
+ end
177
177
 
178
- context "with --raw" do
179
- let(:cmd_args) { %w{-r node_name} }
180
- before { file(".chef/credentials", "[default]\nclient_name = \"three\"\n") }
178
+ context "with --raw" do
179
+ let(:cmd_args) { %w{-r node_name} }
180
+ before { file(".chef/credentials", "[default]\nclient_name = \"three\"\n") }
181
181
 
182
- it { is_expected.to eq("three\n") }
183
- end
182
+ it { is_expected.to eq("three\n") }
183
+ end
184
184
 
185
- context "with --format=json" do
186
- let(:cmd_args) { %w{--format=json node_name} }
187
- before { file(".chef/credentials", "[default]\nclient_name = \"three\"\n") }
185
+ context "with --format=json" do
186
+ let(:cmd_args) { %w{--format=json node_name} }
187
+ before { file(".chef/credentials", "[default]\nclient_name = \"three\"\n") }
188
188
 
189
- it { expect(JSON.parse(subject)).to eq({ "node_name" => "three" }) }
189
+ it { expect(JSON.parse(subject)).to eq({ "node_name" => "three" }) }
190
+ end
190
191
  end
191
192
  end
@@ -22,169 +22,198 @@ describe "knife config list-profiles", :workstation do
22
22
  include KnifeSupport
23
23
 
24
24
  include_context "default config options"
25
- include_context "with a chef repo"
26
-
27
- let(:cmd_args) { [] }
28
- let(:knife_list_profiles) do
29
- knife("config", "list-profiles", *cmd_args, instance_filter: proc {
30
- # Clear the stub set up in KnifeSupport.
31
- allow(File).to receive(:file?).and_call_original
32
- })
33
- end
34
- subject { knife_list_profiles.stdout }
35
-
36
- around do |ex|
37
- # Store and reset the value of some env vars.
38
- old_home = ENV["HOME"]
39
- old_wd = Dir.pwd
40
- # Clear these out because they are cached permanently.
41
- ChefConfig::PathHelper.class_exec { remove_class_variable(:@@home_dir) }
42
- Chef::Knife::ConfigListProfiles.reset_config_loader!
43
- begin
44
- ex.run
45
- ensure
46
- ENV["HOME"] = old_home
47
- Dir.chdir(old_wd)
25
+
26
+ when_the_repository("has a custom env") do
27
+ let(:cmd_args) { [] }
28
+ let(:knife_list_profiles) do
29
+ knife("config", "list-profiles", *cmd_args, instance_filter: lambda { |instance|
30
+ # Fake the failsafe check because this command doesn't actually process knife.rb.
31
+ $__KNIFE_INTEGRATION_FAILSAFE_CHECK << " ole"
32
+ allow(File).to receive(:file?).and_call_original
33
+ })
34
+ end
35
+ subject { knife_list_profiles.stdout }
36
+
37
+ around do |ex|
38
+ # Store and reset the value of some env vars.
39
+ old_home = ENV["HOME"]
40
+ old_wd = Dir.pwd
41
+ # Clear these out because they are cached permanently.
42
+ ChefConfig::PathHelper.class_exec { remove_class_variable(:@@home_dir) }
43
+ Chef::Knife::ConfigListProfiles.reset_config_loader!
44
+ begin
45
+ ex.run
46
+ ensure
47
+ ENV["HOME"] = old_home
48
+ Dir.chdir(old_wd)
49
+ ENV[ChefUtils.windows? ? "CD" : "PWD"] = Dir.pwd
50
+ end
51
+ end
52
+
53
+ before do
54
+ # Always run from the temp folder. This can't be in the `around` block above
55
+ # because it has to run after the before set in the "with a chef repo" shared context.
56
+ directory("repo")
57
+ Dir.chdir(path_to("repo"))
48
58
  ENV[ChefUtils.windows? ? "CD" : "PWD"] = Dir.pwd
59
+ ENV["HOME"] = path_to(".")
49
60
  end
50
- end
51
61
 
52
- before do
53
- # Always run from the temp folder. This can't be in the `around` block above
54
- # because it has to run after the before set in the "with a chef repo" shared context.
55
- directory("repo")
56
- Dir.chdir(path_to("repo"))
57
- ENV[ChefUtils.windows? ? "CD" : "PWD"] = Dir.pwd
58
- ENV["HOME"] = path_to(".")
59
- end
62
+ # NOTE: The funky formatting with # at the end of the line of some of the
63
+ # output examples are because of how the format strings are built, there is
64
+ # substantial trailing whitespace in most cases which many editors "helpfully" remove.
60
65
 
61
- # NOTE: The funky formatting with # at the end of the line of some of the
62
- # output examples are because of how the format strings are built, there is
63
- # substantial trailing whitespace in most cases which many editors "helpfully" remove.
66
+ context "with no credentials file" do
67
+ subject { knife_list_profiles.stderr }
68
+ it { is_expected.to eq "FATAL: No profiles found, #{path_to(".chef/credentials")} does not exist or is empty\n" }
69
+ end
64
70
 
65
- context "with no credentials file" do
66
- subject { knife_list_profiles.stderr }
67
- it { is_expected.to eq "FATAL: No profiles found, #{path_to(".chef/credentials")} does not exist or is empty\n" }
68
- end
71
+ context "with an empty credentials file" do
72
+ before { file(".chef/credentials", "") }
73
+ subject { knife_list_profiles.stderr }
74
+ it { is_expected.to eq "FATAL: No profiles found, #{path_to(".chef/credentials")} does not exist or is empty\n" }
75
+ end
69
76
 
70
- context "with an empty credentials file" do
71
- before { file(".chef/credentials", "") }
72
- subject { knife_list_profiles.stderr }
73
- it { is_expected.to eq "FATAL: No profiles found, #{path_to(".chef/credentials")} does not exist or is empty\n" }
74
- end
77
+ context "with a simple default profile" do
78
+ before { file(".chef/credentials", <<~EOH) }
79
+ [default]
80
+ client_name = "testuser"
81
+ client_key = "testkey.pem"
82
+ chef_server_url = "https://example.com/organizations/testorg"
83
+ EOH
84
+ it { is_expected.to eq <<~EOH.delete("#") }
85
+ Profile Client Key Server #
86
+ ----------------------------------------------------------------------------------#
87
+ *default testuser ~/.chef/testkey.pem https://example.com/organizations/testorg#
88
+ EOH
89
+ end
75
90
 
76
- context "with a simple default profile" do
77
- before { file(".chef/credentials", <<~EOH) }
78
- [default]
79
- client_name = "testuser"
80
- client_key = "testkey.pem"
81
- chef_server_url = "https://example.com/organizations/testorg"
82
- EOH
83
- it { is_expected.to eq <<~EOH.delete("#") }
84
- Profile Client Key Server #
85
- ----------------------------------------------------------------------------------#
86
- *default testuser ~/.chef/testkey.pem https://example.com/organizations/testorg#
87
- EOH
88
- end
91
+ context "with multiple profiles" do
92
+ before { file(".chef/credentials", <<~EOH) }
93
+ [default]
94
+ client_name = "testuser"
95
+ client_key = "testkey.pem"
96
+ chef_server_url = "https://example.com/organizations/testorg"
97
+
98
+ [prod]
99
+ client_name = "testuser"
100
+ client_key = "testkey.pem"
101
+ chef_server_url = "https://example.com/organizations/prod"
102
+
103
+ [qa]
104
+ client_name = "qauser"
105
+ client_key = "~/src/qauser.pem"
106
+ chef_server_url = "https://example.com/organizations/testorg"
107
+ EOH
108
+ it { is_expected.to eq <<~EOH.delete("#") }
109
+ Profile Client Key Server #
110
+ ----------------------------------------------------------------------------------#
111
+ *default testuser ~/.chef/testkey.pem https://example.com/organizations/testorg#
112
+ prod testuser ~/.chef/testkey.pem https://example.com/organizations/prod #
113
+ qa qauser ~/src/qauser.pem https://example.com/organizations/testorg#
114
+ EOH
115
+ end
89
116
 
90
- context "with multiple profiles" do
91
- before { file(".chef/credentials", <<~EOH) }
92
- [default]
93
- client_name = "testuser"
94
- client_key = "testkey.pem"
95
- chef_server_url = "https://example.com/organizations/testorg"
96
-
97
- [prod]
98
- client_name = "testuser"
99
- client_key = "testkey.pem"
100
- chef_server_url = "https://example.com/organizations/prod"
101
-
102
- [qa]
103
- client_name = "qauser"
104
- client_key = "~/src/qauser.pem"
105
- chef_server_url = "https://example.com/organizations/testorg"
106
- EOH
107
- it { is_expected.to eq <<~EOH.delete("#") }
108
- Profile Client Key Server #
109
- ----------------------------------------------------------------------------------#
110
- *default testuser ~/.chef/testkey.pem https://example.com/organizations/testorg#
111
- prod testuser ~/.chef/testkey.pem https://example.com/organizations/prod #
112
- qa qauser ~/src/qauser.pem https://example.com/organizations/testorg#
113
- EOH
114
- end
117
+ context "with a non-default active profile" do
118
+ let(:cmd_args) { %w{--profile prod} }
119
+ before { file(".chef/credentials", <<~EOH) }
120
+ [default]
121
+ client_name = "testuser"
122
+ client_key = "testkey.pem"
123
+ chef_server_url = "https://example.com/organizations/testorg"
124
+
125
+ [prod]
126
+ client_name = "testuser"
127
+ client_key = "testkey.pem"
128
+ chef_server_url = "https://example.com/organizations/prod"
129
+
130
+ [qa]
131
+ client_name = "qauser"
132
+ client_key = "~/src/qauser.pem"
133
+ chef_server_url = "https://example.com/organizations/testorg"
134
+ EOH
135
+ it { is_expected.to eq <<~EOH.delete("#") }
136
+ Profile Client Key Server #
137
+ ----------------------------------------------------------------------------------#
138
+ default testuser ~/.chef/testkey.pem https://example.com/organizations/testorg#
139
+ *prod testuser ~/.chef/testkey.pem https://example.com/organizations/prod #
140
+ qa qauser ~/src/qauser.pem https://example.com/organizations/testorg#
141
+ EOH
142
+ end
115
143
 
116
- context "with a non-default active profile" do
117
- let(:cmd_args) { %w{--profile prod} }
118
- before { file(".chef/credentials", <<~EOH) }
119
- [default]
120
- client_name = "testuser"
121
- client_key = "testkey.pem"
122
- chef_server_url = "https://example.com/organizations/testorg"
123
-
124
- [prod]
125
- client_name = "testuser"
126
- client_key = "testkey.pem"
127
- chef_server_url = "https://example.com/organizations/prod"
128
-
129
- [qa]
130
- client_name = "qauser"
131
- client_key = "~/src/qauser.pem"
132
- chef_server_url = "https://example.com/organizations/testorg"
133
- EOH
134
- it { is_expected.to eq <<~EOH.delete("#") }
135
- Profile Client Key Server #
136
- ----------------------------------------------------------------------------------#
137
- default testuser ~/.chef/testkey.pem https://example.com/organizations/testorg#
138
- *prod testuser ~/.chef/testkey.pem https://example.com/organizations/prod #
139
- qa qauser ~/src/qauser.pem https://example.com/organizations/testorg#
140
- EOH
141
- end
144
+ context "with a bad profile as an active profile" do
145
+ let(:cmd_args) { %w{--profile production} }
146
+ before { file(".chef/credentials", <<~EOH) }
147
+ [default]
148
+ client_name = "testuser"
149
+ client_key = "testkey.pem"
150
+ chef_server_url = "https://example.com/organizations/testorg"
151
+
152
+ [prod]
153
+ client_name = "testuser"
154
+ client_key = "testkey.pem"
155
+ chef_server_url = "https://example.com/organizations/prod"
156
+
157
+ [qa]
158
+ client_name = "qauser"
159
+ client_key = "~/src/qauser.pem"
160
+ chef_server_url = "https://example.com/organizations/testorg"
161
+ EOH
162
+ it { is_expected.to eq <<~EOH.delete("#") }
163
+ Profile Client Key Server #
164
+ ---------------------------------------------------------------------------------#
165
+ default testuser ~/.chef/testkey.pem https://example.com/organizations/testorg#
166
+ prod testuser ~/.chef/testkey.pem https://example.com/organizations/prod #
167
+ qa qauser ~/src/qauser.pem https://example.com/organizations/testorg#
168
+ EOH
169
+ end
142
170
 
143
- context "with a minimal profile" do
144
- before { file(".chef/credentials", <<~EOH) }
145
- [default]
146
- chef_server_url = "https://example.com/organizations/testorg"
147
- EOH
148
- it { is_expected.to match %r{^*default .*? https://example.com/organizations/testorg$} }
149
- end
171
+ context "with a minimal profile" do
172
+ before { file(".chef/credentials", <<~EOH) }
173
+ [default]
174
+ chef_server_url = "https://example.com/organizations/testorg"
175
+ EOH
176
+ it { is_expected.to match %r{^*default .*? https://example.com/organizations/testorg$} }
177
+ end
150
178
 
151
- context "with -i" do
152
- let(:cmd_args) { %w{-i} }
153
- before { file(".chef/credentials", <<~EOH) }
154
- [default]
155
- chef_server_url = "https://example.com/organizations/testorg"
156
- EOH
157
- it { is_expected.to eq <<~EOH.delete("#") }
158
- Profile Client Key Server #
159
- ----------------------------------------------------------------#
160
- *default https://example.com/organizations/testorg#
161
- EOH
162
- end
179
+ context "with -i" do
180
+ let(:cmd_args) { %w{-i} }
181
+ before { file(".chef/credentials", <<~EOH) }
182
+ [default]
183
+ chef_server_url = "https://example.com/organizations/testorg"
184
+ EOH
185
+ it { is_expected.to eq <<~EOH.delete("#") }
186
+ Profile Client Key Server #
187
+ ----------------------------------------------------------------#
188
+ *default https://example.com/organizations/testorg#
189
+ EOH
190
+ end
163
191
 
164
- context "with --format=json" do
165
- let(:cmd_args) { %w{--format=json node_name} }
166
- before { file(".chef/credentials", <<~EOH) }
167
- [default]
168
- client_name = "testuser"
169
- client_key = "testkey.pem"
170
- chef_server_url = "https://example.com/organizations/testorg"
171
-
172
- [prod]
173
- client_name = "testuser"
174
- client_key = "testkey.pem"
175
- chef_server_url = "https://example.com/organizations/prod"
176
-
177
- [qa]
178
- client_name = "qauser"
179
- client_key = "~/src/qauser.pem"
180
- chef_server_url = "https://example.com/organizations/testorg"
181
- EOH
182
- it {
183
- expect(JSON.parse(subject)).to eq [
184
- { "profile" => "default", "active" => true, "client_name" => "testuser", "client_key" => path_to(".chef/testkey.pem"), "server_url" => "https://example.com/organizations/testorg" },
185
- { "profile" => "prod", "active" => false, "client_name" => "testuser", "client_key" => path_to(".chef/testkey.pem"), "server_url" => "https://example.com/organizations/prod" },
186
- { "profile" => "qa", "active" => false, "client_name" => "qauser", "client_key" => path_to("src/qauser.pem"), "server_url" => "https://example.com/organizations/testorg" },
187
- ]
188
- }
192
+ context "with --format=json" do
193
+ let(:cmd_args) { %w{--format=json node_name} }
194
+ before { file(".chef/credentials", <<~EOH) }
195
+ [default]
196
+ client_name = "testuser"
197
+ client_key = "testkey.pem"
198
+ chef_server_url = "https://example.com/organizations/testorg"
199
+
200
+ [prod]
201
+ client_name = "testuser"
202
+ client_key = "testkey.pem"
203
+ chef_server_url = "https://example.com/organizations/prod"
204
+
205
+ [qa]
206
+ client_name = "qauser"
207
+ client_key = "~/src/qauser.pem"
208
+ chef_server_url = "https://example.com/organizations/testorg"
209
+ EOH
210
+ it {
211
+ expect(JSON.parse(subject)).to eq [
212
+ { "profile" => "default", "active" => true, "client_name" => "testuser", "client_key" => path_to(".chef/testkey.pem"), "server_url" => "https://example.com/organizations/testorg" },
213
+ { "profile" => "prod", "active" => false, "client_name" => "testuser", "client_key" => path_to(".chef/testkey.pem"), "server_url" => "https://example.com/organizations/prod" },
214
+ { "profile" => "qa", "active" => false, "client_name" => "qauser", "client_key" => path_to("src/qauser.pem"), "server_url" => "https://example.com/organizations/testorg" },
215
+ ]
216
+ }
217
+ end
189
218
  end
190
219
  end