chef 16.2.73-universal-mingw32 → 16.4.41-universal-mingw32

Sign up to get free protection for your applications and to get access to all the features.
Files changed (316) hide show
  1. checksums.yaml +4 -4
  2. data/Gemfile +4 -4
  3. data/Rakefile +1 -1
  4. data/chef-universal-mingw32.gemspec +2 -3
  5. data/chef.gemspec +2 -1
  6. data/lib/chef/action_collection.rb +4 -0
  7. data/lib/chef/api_client/registration.rb +2 -2
  8. data/lib/chef/application.rb +13 -1
  9. data/lib/chef/application/apply.rb +5 -5
  10. data/lib/chef/application/windows_service.rb +27 -27
  11. data/lib/chef/{whitelist.rb → attribute_allowlist.rb} +11 -11
  12. data/lib/chef/{blacklist.rb → attribute_blocklist.rb} +9 -9
  13. data/lib/chef/chef_class.rb +0 -1
  14. data/lib/chef/chef_fs/chef_fs_data_store.rb +54 -54
  15. data/lib/chef/chef_fs/data_handler/organization_data_handler.rb +1 -2
  16. data/lib/chef/chef_fs/file_system/chef_server/acl_entry.rb +10 -10
  17. data/lib/chef/chef_fs/file_system/chef_server/cookbooks_dir.rb +1 -5
  18. data/lib/chef/chef_fs/file_system/chef_server/organization_invites_entry.rb +8 -8
  19. data/lib/chef/chef_fs/file_system/chef_server/organization_members_entry.rb +8 -8
  20. data/lib/chef/chef_fs/file_system/repository/base_file.rb +1 -0
  21. data/lib/chef/chef_fs/file_system/repository/chef_repository_file_system_cookbook_dir.rb +2 -2
  22. data/lib/chef/chef_fs/file_system/repository/chef_repository_file_system_cookbook_entry.rb +1 -1
  23. data/lib/chef/chef_fs/file_system/repository/chef_repository_file_system_root_dir.rb +18 -18
  24. data/lib/chef/chef_fs/file_system/repository/directory.rb +1 -1
  25. data/lib/chef/chef_fs/file_system/repository/file_system_entry.rb +1 -1
  26. data/lib/chef/chef_fs/parallelizer/parallel_enumerable.rb +1 -1
  27. data/lib/chef/client.rb +14 -14
  28. data/lib/chef/cookbook/remote_file_vendor.rb +1 -3
  29. data/lib/chef/cookbook/syntax_check.rb +1 -2
  30. data/lib/chef/cookbook_loader.rb +15 -29
  31. data/lib/chef/data_bag.rb +1 -2
  32. data/lib/chef/data_collector/run_end_message.rb +11 -1
  33. data/lib/chef/deprecated.rb +8 -0
  34. data/lib/chef/dsl/platform_introspection.rb +9 -7
  35. data/lib/chef/encrypted_data_bag_item/decryptor.rb +1 -1
  36. data/lib/chef/environment.rb +3 -4
  37. data/lib/chef/exceptions.rb +4 -1
  38. data/lib/chef/file_content_management/tempfile.rb +9 -9
  39. data/lib/chef/handler.rb +2 -0
  40. data/lib/chef/http.rb +11 -11
  41. data/lib/chef/http/authenticator.rb +3 -1
  42. data/lib/chef/json_compat.rb +1 -1
  43. data/lib/chef/knife.rb +4 -4
  44. data/lib/chef/knife/bootstrap.rb +6 -12
  45. data/lib/chef/knife/bootstrap/train_connector.rb +1 -0
  46. data/lib/chef/knife/config_get.rb +1 -0
  47. data/lib/chef/knife/config_list_profiles.rb +4 -1
  48. data/lib/chef/knife/configure.rb +3 -1
  49. data/lib/chef/knife/cookbook_download.rb +1 -1
  50. data/lib/chef/knife/cookbook_metadata.rb +1 -1
  51. data/lib/chef/knife/cookbook_upload.rb +28 -33
  52. data/lib/chef/knife/core/gem_glob_loader.rb +1 -1
  53. data/lib/chef/knife/core/generic_presenter.rb +1 -1
  54. data/lib/chef/knife/core/hashed_command_loader.rb +3 -2
  55. data/lib/chef/knife/core/subcommand_loader.rb +20 -1
  56. data/lib/chef/knife/core/ui.rb +8 -2
  57. data/lib/chef/knife/core/windows_bootstrap_context.rb +32 -25
  58. data/lib/chef/knife/delete.rb +15 -15
  59. data/lib/chef/knife/exec.rb +2 -2
  60. data/lib/chef/knife/rehash.rb +3 -21
  61. data/lib/chef/knife/ssh.rb +11 -7
  62. data/lib/chef/knife/xargs.rb +19 -19
  63. data/lib/chef/knife/yaml_convert.rb +1 -1
  64. data/lib/chef/log.rb +7 -2
  65. data/lib/chef/mixin/checksum.rb +0 -1
  66. data/lib/chef/mixin/chef_utils_wiring.rb +40 -0
  67. data/lib/chef/mixin/deep_merge.rb +35 -6
  68. data/{spec/unit/log_spec.rb → lib/chef/mixin/default_paths.rb} +13 -5
  69. data/lib/chef/mixin/openssl_helper.rb +30 -6
  70. data/lib/chef/mixin/path_sanity.rb +5 -4
  71. data/lib/chef/mixin/shell_out.rb +4 -188
  72. data/lib/chef/mixin/template.rb +1 -0
  73. data/lib/chef/mixin/which.rb +6 -3
  74. data/lib/chef/mixins.rb +1 -0
  75. data/lib/chef/monkey_patches/webrick-utils.rb +10 -10
  76. data/lib/chef/node.rb +36 -12
  77. data/lib/chef/node/attribute.rb +2 -4
  78. data/lib/chef/node_map.rb +21 -18
  79. data/lib/chef/platform/service_helpers.rb +31 -28
  80. data/lib/chef/property.rb +1 -1
  81. data/lib/chef/provider/cron/unix.rb +0 -2
  82. data/lib/chef/provider/git.rb +17 -9
  83. data/lib/chef/provider/group.rb +0 -2
  84. data/lib/chef/provider/group/suse.rb +5 -5
  85. data/lib/chef/provider/ifconfig.rb +1 -4
  86. data/lib/chef/provider/mount.rb +0 -2
  87. data/lib/chef/provider/mount/solaris.rb +0 -1
  88. data/lib/chef/provider/package.rb +0 -2
  89. data/lib/chef/provider/package/rubygems.rb +1 -1
  90. data/lib/chef/provider/package/snap.rb +3 -4
  91. data/lib/chef/provider/package/windows.rb +9 -4
  92. data/lib/chef/provider/package/windows/registry_uninstall_entry.rb +9 -9
  93. data/lib/chef/provider/package/zypper.rb +0 -1
  94. data/lib/chef/provider/powershell_script.rb +21 -5
  95. data/lib/chef/provider/route.rb +1 -1
  96. data/lib/chef/provider/service.rb +2 -2
  97. data/lib/chef/provider/service/arch.rb +1 -1
  98. data/lib/chef/provider/service/debian.rb +1 -1
  99. data/lib/chef/provider/service/gentoo.rb +2 -2
  100. data/lib/chef/provider/service/macosx.rb +2 -2
  101. data/lib/chef/provider/service/openbsd.rb +1 -4
  102. data/lib/chef/provider/service/redhat.rb +2 -2
  103. data/lib/chef/provider/service/upstart.rb +1 -1
  104. data/lib/chef/provider/service/windows.rb +10 -10
  105. data/lib/chef/provider/systemd_unit.rb +0 -2
  106. data/lib/chef/provider/template/content.rb +1 -0
  107. data/lib/chef/provider/user/dscl.rb +2 -2
  108. data/lib/chef/provider/user/mac.rb +9 -9
  109. data/lib/chef/provider/windows_task.rb +0 -3
  110. data/lib/chef/provider/yum_repository.rb +1 -1
  111. data/lib/chef/provider/zypper_repository.rb +1 -2
  112. data/lib/chef/providers.rb +0 -1
  113. data/lib/chef/recipe.rb +1 -1
  114. data/lib/chef/resource.rb +8 -10
  115. data/lib/chef/resource/apt_repository.rb +1 -10
  116. data/lib/chef/resource/build_essential.rb +2 -2
  117. data/lib/chef/resource/chef_client_scheduled_task.rb +1 -1
  118. data/lib/chef/resource/chef_client_systemd_timer.rb +2 -2
  119. data/lib/chef/resource/chef_vault_secret.rb +13 -13
  120. data/lib/chef/resource/chocolatey_feature.rb +1 -2
  121. data/lib/chef/resource/cron/cron_d.rb +1 -1
  122. data/lib/chef/resource/cron_access.rb +2 -2
  123. data/lib/chef/resource/execute.rb +4 -5
  124. data/lib/chef/resource/homebrew_update.rb +2 -2
  125. data/lib/chef/resource/hostname.rb +18 -18
  126. data/lib/chef/resource/lwrp_base.rb +1 -0
  127. data/lib/chef/resource/macos_userdefaults.rb +176 -61
  128. data/lib/chef/resource/openssl_dhparam.rb +2 -0
  129. data/lib/chef/resource/openssl_ec_private_key.rb +2 -0
  130. data/lib/chef/resource/openssl_ec_public_key.rb +2 -0
  131. data/lib/chef/resource/openssl_rsa_private_key.rb +2 -0
  132. data/lib/chef/resource/openssl_rsa_public_key.rb +2 -0
  133. data/lib/chef/resource/openssl_x509_certificate.rb +35 -35
  134. data/lib/chef/resource/openssl_x509_crl.rb +3 -2
  135. data/lib/chef/resource/openssl_x509_request.rb +23 -20
  136. data/lib/chef/resource/osx_profile.rb +227 -5
  137. data/lib/chef/resource/powershell_package_source.rb +1 -1
  138. data/lib/chef/resource/powershell_script.rb +24 -30
  139. data/lib/chef/resource/service.rb +2 -2
  140. data/lib/chef/resource/ssh_known_hosts_entry.rb +1 -1
  141. data/lib/chef/resource/sudo.rb +2 -2
  142. data/lib/chef/resource/sysctl.rb +5 -5
  143. data/lib/chef/resource/timezone.rb +112 -73
  144. data/lib/chef/resource/user_ulimit.rb +1 -1
  145. data/lib/chef/resource/windows_ad_join.rb +2 -0
  146. data/lib/chef/resource/windows_audit_policy.rb +3 -0
  147. data/lib/chef/resource/windows_auto_run.rb +2 -0
  148. data/lib/chef/resource/windows_certificate.rb +2 -0
  149. data/lib/chef/resource/windows_dfs_folder.rb +2 -0
  150. data/lib/chef/resource/windows_dfs_namespace.rb +2 -0
  151. data/lib/chef/resource/windows_dfs_server.rb +2 -0
  152. data/lib/chef/resource/windows_dns_record.rb +25 -5
  153. data/lib/chef/resource/windows_dns_zone.rb +12 -7
  154. data/lib/chef/resource/windows_feature.rb +2 -0
  155. data/lib/chef/resource/windows_feature_dism.rb +10 -0
  156. data/lib/chef/resource/windows_feature_powershell.rb +14 -2
  157. data/lib/chef/resource/windows_firewall_profile.rb +199 -0
  158. data/lib/chef/resource/windows_firewall_rule.rb +5 -3
  159. data/lib/chef/resource/windows_font.rb +3 -1
  160. data/lib/chef/resource/windows_pagefile.rb +4 -0
  161. data/lib/chef/resource/windows_printer.rb +17 -18
  162. data/lib/chef/resource/windows_printer_port.rb +14 -13
  163. data/lib/chef/resource/windows_security_policy.rb +51 -20
  164. data/lib/chef/resource/windows_share.rb +5 -3
  165. data/lib/chef/resource/windows_shortcut.rb +2 -0
  166. data/lib/chef/resource/windows_uac.rb +2 -0
  167. data/lib/chef/resource/windows_user_privilege.rb +2 -0
  168. data/lib/chef/resource/windows_workgroup.rb +2 -3
  169. data/lib/chef/resource_collection/stepable_iterator.rb +1 -2
  170. data/lib/chef/resource_inspector.rb +7 -1
  171. data/lib/chef/resources.rb +1 -0
  172. data/lib/chef/role.rb +3 -4
  173. data/lib/chef/run_context/cookbook_compiler.rb +20 -20
  174. data/lib/chef/run_status.rb +2 -6
  175. data/lib/chef/server_api_versions.rb +4 -0
  176. data/lib/chef/shell.rb +1 -1
  177. data/lib/chef/shell/shell_session.rb +2 -0
  178. data/lib/chef/util/backup.rb +1 -1
  179. data/lib/chef/util/diff.rb +11 -12
  180. data/lib/chef/util/powershell/cmdlet.rb +1 -1
  181. data/lib/chef/version.rb +2 -2
  182. data/lib/chef/win32/file.rb +2 -2
  183. data/lib/chef/win32/file/version_info.rb +5 -5
  184. data/lib/chef/win32/registry.rb +1 -2
  185. data/spec/data/ssl/chef-rspec.cert +15 -15
  186. data/spec/functional/knife/ssh_spec.rb +5 -16
  187. data/spec/functional/resource/aix_service_spec.rb +0 -2
  188. data/spec/functional/resource/aixinit_service_spec.rb +7 -8
  189. data/spec/functional/resource/apt_package_spec.rb +0 -1
  190. data/spec/functional/resource/bff_spec.rb +2 -2
  191. data/spec/functional/resource/cookbook_file_spec.rb +1 -1
  192. data/spec/functional/resource/cron_spec.rb +0 -1
  193. data/spec/functional/resource/dsc_resource_spec.rb +1 -1
  194. data/spec/functional/resource/dsc_script_spec.rb +0 -1
  195. data/spec/functional/resource/git_spec.rb +23 -1
  196. data/spec/functional/resource/group_spec.rb +12 -8
  197. data/spec/functional/resource/insserv_spec.rb +4 -5
  198. data/spec/functional/resource/link_spec.rb +20 -20
  199. data/spec/functional/resource/powershell_script_spec.rb +4 -4
  200. data/spec/functional/resource/remote_file_spec.rb +1 -7
  201. data/spec/functional/resource/rpm_spec.rb +2 -2
  202. data/spec/functional/resource/windows_certificate_spec.rb +3 -3
  203. data/spec/functional/resource/windows_font_spec.rb +49 -0
  204. data/spec/functional/resource/windows_security_policy_spec.rb +0 -3
  205. data/spec/functional/resource/windows_user_privilege_spec.rb +1 -1
  206. data/spec/functional/run_lock_spec.rb +26 -25
  207. data/spec/functional/shell_spec.rb +5 -5
  208. data/spec/functional/util/powershell/cmdlet_spec.rb +1 -1
  209. data/spec/functional/version_spec.rb +1 -1
  210. data/spec/functional/win32/registry_spec.rb +8 -8
  211. data/spec/functional/win32/service_manager_spec.rb +1 -1
  212. data/spec/integration/knife/common_options_spec.rb +12 -12
  213. data/spec/integration/knife/config_get_profile_spec.rb +69 -68
  214. data/spec/integration/knife/config_get_spec.rb +126 -125
  215. data/spec/integration/knife/config_list_profiles_spec.rb +181 -152
  216. data/spec/integration/knife/config_use_profile_spec.rb +110 -109
  217. data/spec/integration/knife/cookbook_upload_spec.rb +27 -0
  218. data/spec/integration/knife/diff_spec.rb +3 -1
  219. data/spec/integration/knife/download_spec.rb +3 -1
  220. data/spec/integration/knife/serve_spec.rb +5 -5
  221. data/spec/integration/knife/upload_spec.rb +3 -1
  222. data/spec/integration/recipes/accumulator_spec.rb +1 -1
  223. data/spec/integration/recipes/lwrp_inline_resources_spec.rb +2 -2
  224. data/spec/integration/recipes/lwrp_spec.rb +1 -1
  225. data/spec/integration/recipes/notifies_spec.rb +1 -1
  226. data/spec/integration/recipes/notifying_block_spec.rb +1 -1
  227. data/spec/integration/recipes/recipe_dsl_spec.rb +1 -1
  228. data/spec/integration/recipes/resource_converge_if_changed_spec.rb +2 -0
  229. data/spec/integration/recipes/resource_load_spec.rb +2 -0
  230. data/spec/integration/recipes/unified_mode_spec.rb +1 -1
  231. data/spec/integration/recipes/use_partial_spec.rb +1 -1
  232. data/spec/scripts/ssl-serve.rb +1 -1
  233. data/spec/spec_helper.rb +16 -10
  234. data/spec/support/chef_helpers.rb +1 -20
  235. data/spec/support/platform_helpers.rb +9 -11
  236. data/spec/support/platforms/win32/spec_service.rb +1 -1
  237. data/spec/support/shared/functional/directory_resource.rb +1 -1
  238. data/spec/support/shared/functional/execute_resource.rb +1 -1
  239. data/spec/support/shared/functional/file_resource.rb +20 -21
  240. data/spec/support/shared/functional/win32_service.rb +1 -1
  241. data/spec/support/shared/functional/windows_script.rb +3 -3
  242. data/spec/support/shared/integration/integration_helper.rb +22 -52
  243. data/spec/support/shared/integration/knife_support.rb +2 -9
  244. data/spec/support/shared/unit/application_dot_d.rb +0 -1
  245. data/spec/support/shared/unit/script_resource.rb +6 -20
  246. data/spec/support/shared/unit/windows_script_resource.rb +15 -28
  247. data/spec/unit/application_spec.rb +4 -2
  248. data/spec/unit/chef_fs/file_system/operation_failed_error_spec.rb +2 -4
  249. data/spec/unit/chef_fs/{parallelizer.rb → parallelizer_spec.rb} +1 -1
  250. data/spec/unit/cookbook/gem_installer_spec.rb +2 -1
  251. data/spec/unit/data_collector_spec.rb +29 -1
  252. data/spec/unit/dsl/platform_introspection_spec.rb +1 -0
  253. data/spec/unit/environment_spec.rb +7 -7
  254. data/spec/unit/event_dispatch/dispatcher_spec.rb +3 -0
  255. data/spec/unit/http/api_versions_spec.rb +19 -1
  256. data/spec/unit/json_compat_spec.rb +1 -1
  257. data/spec/unit/knife/bootstrap_spec.rb +16 -20
  258. data/spec/unit/knife/cookbook_download_spec.rb +4 -4
  259. data/spec/unit/knife/cookbook_metadata_from_file_spec.rb +1 -1
  260. data/spec/unit/knife/cookbook_upload_spec.rb +7 -10
  261. data/spec/unit/knife/core/hashed_command_loader_spec.rb +3 -3
  262. data/spec/unit/knife/core/windows_bootstrap_context_spec.rb +21 -12
  263. data/spec/unit/knife/supermarket_share_spec.rb +1 -1
  264. data/spec/unit/log/syslog_spec.rb +6 -10
  265. data/spec/unit/log/winevt_spec.rb +21 -13
  266. data/spec/unit/lwrp_spec.rb +4 -4
  267. data/spec/unit/mixin/{path_sanity_spec.rb → default_paths_spec.rb} +14 -14
  268. data/spec/unit/mixin/powershell_exec_spec.rb +1 -1
  269. data/spec/unit/mixin/securable_spec.rb +0 -1
  270. data/spec/unit/mixin/shell_out_spec.rb +25 -26
  271. data/spec/unit/mixin/template_spec.rb +30 -30
  272. data/spec/unit/mixin/which.rb +8 -0
  273. data/spec/unit/mixin/windows_architecture_helper_spec.rb +4 -4
  274. data/spec/unit/node/immutable_collections_spec.rb +6 -2
  275. data/spec/unit/node_spec.rb +103 -16
  276. data/spec/unit/property_spec.rb +5 -5
  277. data/spec/unit/provider/execute_spec.rb +0 -7
  278. data/spec/unit/provider/ifconfig_spec.rb +0 -1
  279. data/spec/unit/provider/package/dnf/python_helper_spec.rb +1 -1
  280. data/spec/unit/provider/package/rubygems_spec.rb +5 -10
  281. data/spec/unit/provider/package/smartos_spec.rb +1 -1
  282. data/spec/unit/provider/package/windows_spec.rb +30 -53
  283. data/spec/unit/provider/powershell_script_spec.rb +11 -4
  284. data/spec/unit/provider/remote_directory_spec.rb +9 -9
  285. data/spec/unit/provider/service/arch_service_spec.rb +3 -2
  286. data/spec/unit/provider/service/debian_service_spec.rb +1 -1
  287. data/spec/unit/provider/service/gentoo_service_spec.rb +7 -7
  288. data/spec/unit/provider/service/macosx_spec.rb +3 -3
  289. data/spec/unit/provider/service/redhat_spec.rb +3 -3
  290. data/spec/unit/provider/service/upstart_service_spec.rb +3 -3
  291. data/spec/unit/provider/service/windows_spec.rb +2 -6
  292. data/spec/unit/provider/systemd_unit_spec.rb +28 -24
  293. data/spec/unit/provider_resolver_spec.rb +6 -6
  294. data/spec/unit/provider_spec.rb +1 -0
  295. data/spec/unit/resource/batch_spec.rb +6 -6
  296. data/spec/unit/resource/execute_spec.rb +123 -118
  297. data/spec/unit/resource/macos_user_defaults_spec.rb +103 -2
  298. data/spec/unit/resource/osx_profile_spec.rb +233 -0
  299. data/spec/unit/resource/powershell_script_spec.rb +11 -29
  300. data/spec/unit/resource/script_spec.rb +6 -1
  301. data/spec/unit/resource/timezone_spec.rb +63 -0
  302. data/spec/unit/resource/windows_feature_powershell_spec.rb +30 -4
  303. data/spec/unit/resource/windows_firewall_profile_spec.rb +77 -0
  304. data/spec/unit/resource/windows_package_spec.rb +1 -0
  305. data/spec/unit/resource_reporter_spec.rb +1 -1
  306. data/spec/unit/role_spec.rb +11 -11
  307. data/spec/unit/run_context/cookbook_compiler_spec.rb +1 -1
  308. data/spec/unit/run_lock_spec.rb +1 -1
  309. data/spec/unit/scan_access_control_spec.rb +1 -1
  310. data/spec/unit/server_api_spec.rb +43 -16
  311. data/spec/unit/util/diff_spec.rb +1 -15
  312. data/spec/unit/win32/security_spec.rb +4 -3
  313. data/tasks/rspec.rb +1 -1
  314. metadata +39 -31
  315. data/lib/chef/provider/osx_profile.rb +0 -255
  316. data/spec/unit/provider/osx_profile_spec.rb +0 -255
@@ -58,4 +58,237 @@ describe Chef::Resource::OsxProfile do
58
58
  resource.profile test_profile
59
59
  expect(resource.profile).to be_a(Hash)
60
60
  end
61
+
62
+ let(:shell_out_success) do
63
+ double("shell_out", exitstatus: 0, error?: false)
64
+ end
65
+
66
+ describe "action_create" do
67
+ let(:node) { Chef::Node.new }
68
+ let(:events) { Chef::EventDispatch::Dispatcher.new }
69
+ let(:run_context) { Chef::RunContext.new(node, {}, events) }
70
+ let(:resource) { Chef::Resource::OsxProfile.new("Profile Test", run_context) }
71
+ let(:provider) { resource.provider_for_action(:create) }
72
+ let(:all_profiles) do
73
+ { "_computerlevel" => [{ "ProfileDisplayName" => "Finder Settings",
74
+ "ProfileIdentifier" => "com.apple.finder",
75
+ "ProfileInstallDate" => "2015-11-08 23:15:21 +0000",
76
+ "ProfileItems" => [{ "PayloadContent" => { "PayloadContentManagedPreferences" => { "com.apple.finder" => { "Forced" => [{ "mcx_preference_settings" => { "ShowExternalHardDrivesOnDesktop" => false } }] } } },
77
+ "PayloadDisplayName" => "Custom: (com.apple.finder)",
78
+ "PayloadIdentifier" => "com.apple.finder",
79
+ "PayloadType" => "com.apple.ManagedClient.preferences",
80
+ "PayloadUUID" => "a017048f-684b-4e81-baa3-43afe316d739",
81
+ "PayloadVersion" => 1 }],
82
+ "ProfileOrganization" => "Chef",
83
+ "ProfileRemovalDisallowed" => "false",
84
+ "ProfileType" => "Configuration",
85
+ "ProfileUUID" => "e2e09bef-e673-44a6-bcbe-ecb5f1c1b740",
86
+ "ProfileVerificationState" => "unsigned",
87
+ "ProfileVersion" => 1 },
88
+ { "ProfileDisplayName" => "ScreenSaver Settings",
89
+ "ProfileIdentifier" => "com.testprofile.screensaver",
90
+ "ProfileInstallDate" => "2015-10-05 23:15:21 +0000",
91
+ "ProfileItems" => [{ "PayloadContent" => { "PayloadContentManagedPreferences" => { "com.apple.screensaver" => { "Forced" => [{ "mcx_preference_settings" => { "idleTime" => 0 } }] } } },
92
+ "PayloadDisplayName" => "Custom: (com.apple.screensaver)",
93
+ "PayloadIdentifier" => "com.apple.screensaver",
94
+ "PayloadType" => "com.apple.ManagedClient.preferences",
95
+ "PayloadUUID" => "73fc30e0-1e57-0131-c32d-000c2944c110",
96
+ "PayloadVersion" => 1 }],
97
+ "ProfileOrganization" => "Chef",
98
+ "ProfileRemovalDisallowed" => "false",
99
+ "ProfileType" => "Configuration",
100
+ "ProfileUUID" => "6e95927c-f200-54b4-85c7-52ab99b61c47",
101
+ "ProfileVerificationState" => "unsigned",
102
+ "ProfileVersion" => 1 }],
103
+ }
104
+ end
105
+ # If anything is changed within this profile, be sure to update the
106
+ # ProfileUUID in all_profiles to match the new config specific UUID
107
+ let(:test_profile) do
108
+ {
109
+ "PayloadIdentifier" => "com.testprofile.screensaver",
110
+ "PayloadRemovalDisallowed" => false,
111
+ "PayloadScope" => "System",
112
+ "PayloadType" => "Configuration",
113
+ "PayloadUUID" => "1781fbec-3325-565f-9022-8aa28135c3cc",
114
+ "PayloadOrganization" => "Chef",
115
+ "PayloadVersion" => 1,
116
+ "PayloadDisplayName" => "Screensaver Settings",
117
+ "PayloadContent" => [
118
+ {
119
+ "PayloadType" => "com.apple.ManagedClient.preferences",
120
+ "PayloadVersion" => 1,
121
+ "PayloadIdentifier" => "com.testprofile.screensaver",
122
+ "PayloadUUID" => "73fc30e0-1e57-0131-c32d-000c2944c108",
123
+ "PayloadEnabled" => true,
124
+ "PayloadDisplayName" => "com.apple.screensaver",
125
+ "PayloadContent" => {
126
+ "com.apple.screensaver" => {
127
+ "Forced" => [
128
+ {
129
+ "mcx_preference_settings" => {
130
+ "idleTime" => 0,
131
+ },
132
+ },
133
+ ],
134
+ },
135
+ },
136
+ },
137
+ ],
138
+ }
139
+ end
140
+ let(:no_profiles) do
141
+ {}
142
+ end
143
+
144
+ before(:each) do
145
+ allow(provider).to receive(:cookbook_file_available?).and_return(true)
146
+ allow(provider).to receive(:cache_cookbook_profile).and_return("/tmp/test.mobileconfig.remote")
147
+ allow(provider).to receive(:get_new_profile_hash).and_return(test_profile)
148
+ allow(provider).to receive(:get_installed_profiles).and_return(all_profiles)
149
+ allow(provider).to receive(:read_plist).and_return(all_profiles)
150
+ allow(::File).to receive(:unlink).and_return(true)
151
+ end
152
+
153
+ it "should build the get all profiles shellout command correctly" do
154
+ profile_name = "com.testprofile.screensaver.mobileconfig"
155
+ resource.profile_name profile_name
156
+ allow(provider).to receive(:get_installed_profiles).and_call_original
157
+ allow(provider).to receive(:read_plist).and_return(all_profiles)
158
+ expect(provider).to receive(:shell_out_compacted).with("/usr/bin/profiles", "-P", "-o", kind_of(String))
159
+ provider.load_current_resource
160
+ end
161
+
162
+ it "should use profile name as profile when no profile is set" do
163
+ profile_name = "com.testprofile.screensaver.mobileconfig"
164
+ resource.profile_name profile_name
165
+ provider.load_current_resource
166
+ expect(resource.profile_name).to eql(profile_name)
167
+ end
168
+
169
+ it "should use identifier from specified profile" do
170
+ resource.profile test_profile
171
+ provider.load_current_resource
172
+ expect(
173
+ provider.instance_variable_get(:@new_profile_identifier)
174
+ ).to eql(test_profile["PayloadIdentifier"])
175
+ end
176
+
177
+ it "should install when not installed" do
178
+ resource.profile test_profile
179
+ allow(provider).to receive(:get_installed_profiles).and_return(no_profiles)
180
+ provider.load_current_resource
181
+ expect(provider).to receive(:install_profile)
182
+ expect { provider.run_action(:install) }.to_not raise_error
183
+ end
184
+
185
+ it "does not install if the profile is already installed" do
186
+ resource.profile test_profile
187
+ allow(provider).to receive(:get_installed_profiles).and_return(all_profiles)
188
+ provider.load_current_resource
189
+ expect(provider).to_not receive(:install_profile)
190
+ expect { provider.action_install }.to_not raise_error
191
+ end
192
+
193
+ it "should install when installed but uuid differs" do
194
+ resource.profile test_profile
195
+ all_profiles["_computerlevel"][1]["ProfileUUID"] = "1781fbec-3325-565f-9022-9bb39245d4dd"
196
+ provider.load_current_resource
197
+ expect(provider).to receive(:install_profile)
198
+ expect { provider.run_action(:install) }.to_not raise_error
199
+ end
200
+
201
+ it "should build the shellout install command correctly" do
202
+ profile_path = "/tmp/test.mobileconfig"
203
+ resource.profile test_profile
204
+ # Change the profile so it triggers an install
205
+ all_profiles["_computerlevel"][1]["ProfileUUID"] = "1781fbec-3325-565f-9022-9bb39245d4dd"
206
+ provider.load_current_resource
207
+ allow(provider).to receive(:write_profile_to_disk).and_return(profile_path)
208
+ expect(provider).to receive(:shell_out_compacted!).with("/usr/bin/profiles", "-I", "-F", profile_path).and_return(shell_out_success)
209
+ provider.action_install
210
+ end
211
+
212
+ it "should fail if there is no identifier inside the profile" do
213
+ test_profile.delete("PayloadIdentifier")
214
+ resource.profile test_profile
215
+ error_message = "The specified profile does not seem to be valid"
216
+ expect { provider.run_action(:install) }.to raise_error(RuntimeError, error_message)
217
+ end
218
+ end
219
+
220
+ describe "action_remove" do
221
+ let(:node) { Chef::Node.new }
222
+ let(:events) { Chef::EventDispatch::Dispatcher.new }
223
+ let(:run_context) { Chef::RunContext.new(node, {}, events) }
224
+ let(:resource) { Chef::Resource::OsxProfile.new("Profile Test", run_context) }
225
+ let(:provider) { resource.provider_for_action(:remove) }
226
+ let(:current_resource) { Chef::Resource::OsxProfile.new("Profile Test") }
227
+ let(:all_profiles) do
228
+ { "_computerlevel" => [{ "ProfileDisplayName" => "ScreenSaver Settings",
229
+ "ProfileIdentifier" => "com.apple.screensaver",
230
+ "ProfileInstallDate" => "2015-10-05 23:15:21 +0000",
231
+ "ProfileItems" => [{ "PayloadContent" => { "PayloadContentManagedPreferences" => { "com.apple.screensaver" => { "Forced" => [{ "mcx_preference_settings" => { "idleTime" => 0 } }] } } },
232
+ "PayloadDisplayName" => "Custom: (com.apple.screensaver)",
233
+ "PayloadIdentifier" => "com.apple.screensaver",
234
+ "PayloadType" => "com.apple.ManagedClient.preferences",
235
+ "PayloadUUID" => "73fc30e0-1e57-0131-c32d-000c2944c108",
236
+ "PayloadVersion" => 1 }],
237
+ "ProfileOrganization" => "Chef",
238
+ "ProfileRemovalDisallowed" => "false",
239
+ "ProfileType" => "Configuration",
240
+ "ProfileUUID" => "1781fbec-3325-565f-9022-8aa28135c3cc",
241
+ "ProfileVerificationState" => "unsigned",
242
+ "ProfileVersion" => 1 },
243
+ { "ProfileDisplayName" => "ScreenSaver Settings",
244
+ "ProfileIdentifier" => "com.testprofile.screensaver",
245
+ "ProfileInstallDate" => "2015-10-05 23:15:21 +0000",
246
+ "ProfileItems" => [{ "PayloadContent" => { "PayloadContentManagedPreferences" => { "com.apple.screensaver" => { "Forced" => [{ "mcx_preference_settings" => { "idleTime" => 0 } }] } } },
247
+ "PayloadDisplayName" => "Custom: (com.apple.screensaver)",
248
+ "PayloadIdentifier" => "com.apple.screensaver",
249
+ "PayloadType" => "com.apple.ManagedClient.preferences",
250
+ "PayloadUUID" => "73fc30e0-1e57-0131-c32d-000c2944c110",
251
+ "PayloadVersion" => 1 }],
252
+ "ProfileOrganization" => "Chef",
253
+ "ProfileRemovalDisallowed" => "false",
254
+ "ProfileType" => "Configuration",
255
+ "ProfileUUID" => "1781fbec-3325-565f-9022-8aa28135c3cc",
256
+ "ProfileVerificationState" => "unsigned",
257
+ "ProfileVersion" => 1 }],
258
+ }
259
+ end
260
+
261
+ before(:each) do
262
+ provider.current_resource = current_resource
263
+ allow(provider).to receive(:get_installed_profiles).and_return(all_profiles)
264
+ end
265
+
266
+ it "should use resource name for identifier when not specified" do
267
+ resource.profile_name "com.testprofile.screensaver"
268
+ resource.action(:remove)
269
+ provider.load_current_resource
270
+ expect(provider.instance_variable_get(:@new_profile_identifier)).to eql(resource.profile_name)
271
+ end
272
+
273
+ it "should use specified identifier" do
274
+ resource.identifier "com.testprofile.screensaver"
275
+ resource.action(:remove)
276
+ provider.load_current_resource
277
+ expect(provider.instance_variable_get(:@new_profile_identifier)).to eql(resource.identifier)
278
+ end
279
+
280
+ it "should work with spaces in the identifier" do
281
+ provider.action = :remove
282
+ provider.define_resource_requirements
283
+ expect { provider.process_resource_requirements }.not_to raise_error
284
+ end
285
+
286
+ it "should build the shellout remove command correctly" do
287
+ resource.identifier "com.testprofile.screensaver"
288
+ resource.action(:remove)
289
+ provider.load_current_resource
290
+ expect(provider).to receive(:shell_out_compacted!).with("/usr/bin/profiles", "-R", "-p", resource.identifier).and_return(shell_out_success)
291
+ provider.action_remove
292
+ end
293
+ end
61
294
  end
@@ -20,7 +20,7 @@ require "spec_helper"
20
20
 
21
21
  describe Chef::Resource::PowershellScript do
22
22
 
23
- before(:each) do
23
+ let(:resource) do
24
24
  node = Chef::Node.new
25
25
 
26
26
  node.default["kernel"] = {}
@@ -29,26 +29,25 @@ describe Chef::Resource::PowershellScript do
29
29
 
30
30
  run_context = Chef::RunContext.new(node, nil, nil)
31
31
 
32
- @resource = Chef::Resource::PowershellScript.new("powershell_unit_test", run_context)
32
+ Chef::Resource::PowershellScript.new("powershell_unit_test", run_context)
33
33
  end
34
34
 
35
35
  it "creates a new Chef::Resource::PowershellScript" do
36
- expect(@resource).to be_a_kind_of(Chef::Resource::PowershellScript)
36
+ expect(resource).to be_a_kind_of(Chef::Resource::PowershellScript)
37
37
  end
38
38
 
39
39
  it "sets convert_boolean_return to false by default" do
40
- expect(@resource.convert_boolean_return).to eq(false)
40
+ expect(resource.convert_boolean_return).to eq(false)
41
41
  end
42
42
 
43
43
  it "returns the value for convert_boolean_return that was set" do
44
- @resource.convert_boolean_return true
45
- expect(@resource.convert_boolean_return).to eq(true)
46
- @resource.convert_boolean_return false
47
- expect(@resource.convert_boolean_return).to eq(false)
44
+ resource.convert_boolean_return true
45
+ expect(resource.convert_boolean_return).to eq(true)
46
+ resource.convert_boolean_return false
47
+ expect(resource.convert_boolean_return).to eq(false)
48
48
  end
49
49
 
50
50
  context "when using guards" do
51
- let(:resource) { @resource }
52
51
  before(:each) do
53
52
  allow(resource).to receive(:run_action)
54
53
  allow(resource).to receive(:updated).and_return(true)
@@ -126,28 +125,11 @@ describe Chef::Resource::PowershellScript do
126
125
  end
127
126
 
128
127
  context "as a script running in Windows-based scripting language" do
129
- let(:resource_instance) { @resource }
130
- let(:resource_instance_name ) { @resource.command }
128
+ let(:windows_script_resource) { resource }
129
+ let(:resource_instance_name ) { resource.command }
131
130
  let(:resource_name) { :powershell_script }
132
131
  let(:interpreter_file_name) { "powershell.exe" }
133
- before do
134
- allow(@resource).to receive(:default_flags).and_return(nil)
135
- end
136
- it_behaves_like "a Windows script resource"
137
- end
138
-
139
- describe "#flags" do
140
- let(:resource) { @resource }
141
-
142
- it "appends user's flags to the defaults" do
143
- flags = %q{-Lunch "tacos"}
144
- resource.flags = flags
145
132
 
146
- expect(resource.flags).to eq("#{resource.default_flags} #{flags}")
147
- end
148
-
149
- it "uses the defaults when user doesn't provide flags" do
150
- expect(resource.flags).to eq(resource.default_flags)
151
- end
133
+ it_behaves_like "a Windows script resource"
152
134
  end
153
135
  end
@@ -21,9 +21,14 @@ require "spec_helper"
21
21
 
22
22
  describe Chef::Resource::Script do
23
23
  let(:resource_instance_name) { "fakey_fakerton" }
24
- let(:script_resource) { Chef::Resource::Script.new(resource_instance_name) }
25
24
  let(:resource_name) { :script }
26
25
 
26
+ let(:script_resource) do
27
+ run_context = Chef::RunContext.new(Chef::Node.new, nil, nil)
28
+
29
+ Chef::Resource::Script.new(resource_instance_name, run_context)
30
+ end
31
+
27
32
  it "sets the default action as :run" do
28
33
  expect(script_resource.action).to eql([:run])
29
34
  end
@@ -20,6 +20,31 @@ require "spec_helper"
20
20
  describe Chef::Resource::Timezone do
21
21
  let(:resource) { Chef::Resource::Timezone.new("fakey_fakerton") }
22
22
 
23
+ let(:shellout_tzutil) do
24
+ double("shell_out", stdout: "UTC\n", exitstatus: 0, error?: false)
25
+ end
26
+
27
+ # note: This weird indention is correct
28
+ let(:shellout_timedatectl) do
29
+ double("shell_out", exitstatus: 0, error?: false, stdout: <<-OUTPUT)
30
+ Local time: Tue 2020-08-18 20:55:05 UTC
31
+ Universal time: Tue 2020-08-18 20:55:05 UTC
32
+ RTC time: Tue 2020-08-18 20:55:05
33
+ Time zone: Etc/UTC (UTC, +0000)
34
+ System clock synchronized: yes
35
+ systemd-timesyncd.service active: yes
36
+ RTC in local TZ: no
37
+ OUTPUT
38
+ end
39
+
40
+ let(:shellout_systemsetup_fail) do
41
+ double("shell_out!", stdout: "You need administrator access to run this tool... exiting!", exitstatus: 0, error?: false) # yes it's a non-error exit
42
+ end
43
+
44
+ let(:shellout_systemsetup) do
45
+ double("shell_out!", stdout: "Time Zone: UTC", exitstatus: 0, error?: false)
46
+ end
47
+
23
48
  it "sets resource name as :timezone" do
24
49
  expect(resource.resource_name).to eql(:timezone)
25
50
  end
@@ -36,4 +61,42 @@ describe Chef::Resource::Timezone do
36
61
  expect { resource.action :set }.not_to raise_error
37
62
  expect { resource.action :unset }.to raise_error(Chef::Exceptions::ValidationFailed)
38
63
  end
64
+
65
+ describe "#current_macos_tz" do
66
+ context "with admin privs" do
67
+ it "returns the TZ" do
68
+ expect(resource).to receive(:shell_out!).and_return(shellout_systemsetup)
69
+ expect(resource.current_macos_tz).to eql("UTC")
70
+ end
71
+ end
72
+
73
+ context "without admin privs" do
74
+ it "returns the TZ" do
75
+ expect(resource).to receive(:shell_out!).and_return(shellout_systemsetup_fail)
76
+ expect { resource.current_macos_tz }.to raise_error(RuntimeError, "The timezone resource requires administrative privileges to run on macOS hosts!")
77
+ end
78
+ end
79
+ end
80
+
81
+ describe "#current_systemd_tz" do
82
+ it "returns the TZ" do
83
+ expect(resource).to receive(:shell_out).and_return(shellout_timedatectl)
84
+ expect(resource.current_systemd_tz).to eql("Etc/UTC")
85
+ end
86
+ end
87
+
88
+ describe "#current_windows_tz" do
89
+ it "returns the TZ" do
90
+ expect(resource).to receive(:shell_out).and_return(shellout_tzutil)
91
+ expect(resource.current_windows_tz).to eql("UTC")
92
+ end
93
+ end
94
+
95
+ describe "#current_rhel_tz" do
96
+ it "returns the TZ" do
97
+ allow(File).to receive(:exist?).with("/etc/sysconfig/clock").and_return true
98
+ expect(File).to receive(:read).with("/etc/sysconfig/clock").and_return 'ZONE="UTC"'
99
+ expect(resource.current_rhel_tz).to eql("UTC")
100
+ end
101
+ end
39
102
  end
@@ -22,6 +22,7 @@ describe Chef::Resource::WindowsFeaturePowershell do
22
22
  let(:events) { Chef::EventDispatch::Dispatcher.new }
23
23
  let(:run_context) { Chef::RunContext.new(node, {}, events) }
24
24
  let(:resource) { Chef::Resource::WindowsFeaturePowershell.new(%w{SNMP DHCP}, run_context) }
25
+ let(:provider) { resource.provider_for_action(:install) }
25
26
 
26
27
  it "sets resource name as :windows_feature_powershell" do
27
28
  expect(resource.resource_name).to eql(:windows_feature_powershell)
@@ -35,10 +36,6 @@ describe Chef::Resource::WindowsFeaturePowershell do
35
36
  expect(resource.feature_name).to eql(%w{snmp dhcp})
36
37
  end
37
38
 
38
- it "sets the default action as :install" do
39
- expect(resource.action).to eql([:install])
40
- end
41
-
42
39
  it "supports :delete, :install, :remove actions" do
43
40
  expect { resource.action :delete }.not_to raise_error
44
41
  expect { resource.action :install }.not_to raise_error
@@ -54,4 +51,33 @@ describe Chef::Resource::WindowsFeaturePowershell do
54
51
  resource.feature_name "SNMP"
55
52
  expect(resource.feature_name).to eql(["snmp"])
56
53
  end
54
+
55
+ it "install a single feature" do
56
+ resource.feature_name "snmp"
57
+ expect { resource.action :install }.not_to raise_error
58
+ end
59
+
60
+ it "install multi feature" do
61
+ resource.feature_name "SNMP, DHCP"
62
+ expect { resource.action :install }.not_to raise_error
63
+ end
64
+
65
+ it "does not attempt to install features that have been removed" do
66
+ node.default["powershell_features_cache"] ||= {}
67
+ node.default["powershell_features_cache"]["disabled"] = ["dhcp"]
68
+ node.default["powershell_features_cache"]["removed"] = ["snmp"]
69
+ resource.feature_name "dhcp, snmp"
70
+
71
+ expect(provider.features_to_install).to eq(["dhcp"])
72
+ end
73
+
74
+ it "attempts to install features that have been removed when source is set" do
75
+ node.default["powershell_features_cache"] ||= {}
76
+ node.default["powershell_features_cache"]["disabled"] = ["dhcp"]
77
+ node.default["powershell_features_cache"]["removed"] = ["snmp"]
78
+ resource.feature_name "dhcp, snmp"
79
+ resource.source 'D:\\sources\\sxs'
80
+
81
+ expect(provider.features_to_install).to eq(%w{dhcp snmp})
82
+ end
57
83
  end