chef 16.3.45-universal-mingw32 → 16.5.77-universal-mingw32
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/Gemfile +1 -1
- data/Rakefile +2 -2
- data/bin/knife +1 -1
- data/chef-universal-mingw32.gemspec +0 -1
- data/chef.gemspec +2 -1
- data/distro/templates/powershell/chef/chef.psm1.erb +18 -18
- data/ext/win32-eventlog/Rakefile +2 -2
- data/ext/win32-eventlog/chef-log.man.erb +4 -4
- data/lib/chef/action_collection.rb +4 -0
- data/lib/chef/api_client/registration.rb +2 -2
- data/lib/chef/application.rb +20 -18
- data/lib/chef/application/apply.rb +17 -12
- data/lib/chef/application/base.rb +26 -23
- data/lib/chef/application/client.rb +10 -4
- data/lib/chef/application/exit_code.rb +13 -4
- data/lib/chef/application/knife.rb +22 -11
- data/lib/chef/application/solo.rb +2 -1
- data/lib/chef/application/windows_service.rb +39 -39
- data/lib/chef/application/windows_service_manager.rb +6 -6
- data/lib/chef/chef_class.rb +0 -1
- data/lib/chef/chef_fs/chef_fs_data_store.rb +55 -55
- data/lib/chef/chef_fs/file_system/chef_server/acl_entry.rb +10 -10
- data/lib/chef/chef_fs/file_system/chef_server/organization_invites_entry.rb +8 -8
- data/lib/chef/chef_fs/file_system/chef_server/organization_members_entry.rb +8 -8
- data/lib/chef/chef_fs/file_system/repository/chef_repository_file_system_cookbook_dir.rb +2 -2
- data/lib/chef/chef_fs/file_system/repository/chef_repository_file_system_cookbook_entry.rb +2 -2
- data/lib/chef/chef_fs/file_system/repository/chef_repository_file_system_root_dir.rb +18 -18
- data/lib/chef/chef_fs/file_system/repository/directory.rb +1 -1
- data/lib/chef/chef_fs/file_system/repository/file_system_entry.rb +1 -1
- data/lib/chef/chef_fs/knife.rb +2 -2
- data/lib/chef/chef_fs/parallelizer.rb +0 -1
- data/lib/chef/client.rb +21 -22
- data/lib/chef/cookbook/cookbook_version_loader.rb +1 -1
- data/lib/chef/cookbook/gem_installer.rb +1 -1
- data/lib/chef/cookbook/synchronizer.rb +2 -2
- data/lib/chef/cookbook_site_streaming_uploader.rb +13 -11
- data/lib/chef/cookbook_uploader.rb +1 -1
- data/lib/chef/data_collector.rb +6 -5
- data/lib/chef/data_collector/config_validation.rb +22 -13
- data/lib/chef/data_collector/run_end_message.rb +13 -3
- data/lib/chef/data_collector/run_start_message.rb +1 -1
- data/lib/chef/deprecated.rb +1 -1
- data/lib/chef/deprecation/warnings.rb +2 -2
- data/lib/chef/digester.rb +2 -2
- data/lib/chef/dsl/chef_vault.rb +1 -1
- data/lib/chef/dsl/data_query.rb +2 -2
- data/lib/chef/dsl/platform_introspection.rb +9 -9
- data/lib/chef/encrypted_data_bag_item.rb +3 -4
- data/lib/chef/encrypted_data_bag_item/decryptor.rb +3 -3
- data/lib/chef/encrypted_data_bag_item/encryptor.rb +3 -3
- data/lib/chef/environment.rb +4 -4
- data/lib/chef/event_loggers/windows_eventlog.rb +2 -2
- data/lib/chef/exceptions.rb +5 -5
- data/lib/chef/file_access_control/windows.rb +5 -1
- data/lib/chef/file_content_management/tempfile.rb +10 -10
- data/lib/chef/formatters/doc.rb +7 -6
- data/lib/chef/formatters/error_inspectors/api_error_formatting.rb +6 -5
- data/lib/chef/formatters/error_inspectors/node_load_error_inspector.rb +3 -3
- data/lib/chef/formatters/error_inspectors/registration_error_inspector.rb +9 -9
- data/lib/chef/formatters/error_inspectors/resource_failure_inspector.rb +2 -2
- data/lib/chef/formatters/error_inspectors/run_list_expansion_error_inspector.rb +3 -3
- data/lib/chef/formatters/indentable_output_stream.rb +2 -2
- data/lib/chef/formatters/minimal.rb +5 -4
- data/lib/chef/http.rb +6 -3
- data/lib/chef/http/auth_credentials.rb +5 -1
- data/lib/chef/http/authenticator.rb +1 -1
- data/lib/chef/http/basic_client.rb +4 -2
- data/lib/chef/http/decompressor.rb +1 -1
- data/lib/chef/http/http_request.rb +7 -5
- data/lib/chef/http/socketless_chef_zero_client.rb +5 -2
- data/lib/chef/http/ssl_policies.rb +1 -1
- data/lib/chef/json_compat.rb +2 -2
- data/lib/chef/knife.rb +4 -4
- data/lib/chef/knife/bootstrap.rb +18 -16
- data/lib/chef/knife/bootstrap/chef_vault_handler.rb +1 -1
- data/lib/chef/knife/bootstrap/templates/chef-full.erb +3 -3
- data/lib/chef/knife/bootstrap/templates/windows-chef-client-msi.erb +7 -7
- data/lib/chef/knife/client_create.rb +3 -3
- data/lib/chef/knife/config_get.rb +8 -97
- data/lib/chef/knife/config_get_profile.rb +9 -9
- data/lib/chef/knife/config_list.rb +139 -0
- data/lib/chef/knife/config_list_profiles.rb +8 -98
- data/lib/chef/knife/config_show.rb +127 -0
- data/lib/chef/knife/config_use.rb +61 -0
- data/lib/chef/knife/config_use_profile.rb +9 -24
- data/lib/chef/knife/configure.rb +4 -2
- data/lib/chef/knife/cookbook_download.rb +1 -1
- data/lib/chef/knife/cookbook_metadata.rb +1 -1
- data/lib/chef/knife/cookbook_upload.rb +23 -23
- data/lib/chef/knife/core/bootstrap_context.rb +2 -2
- data/lib/chef/knife/core/generic_presenter.rb +1 -1
- data/lib/chef/knife/core/hashed_command_loader.rb +2 -2
- data/lib/chef/knife/core/object_loader.rb +1 -1
- data/lib/chef/knife/core/ui.rb +1 -1
- data/lib/chef/knife/core/windows_bootstrap_context.rb +42 -34
- data/lib/chef/knife/delete.rb +15 -15
- data/lib/chef/knife/exec.rb +4 -4
- data/lib/chef/knife/node_policy_set.rb +2 -2
- data/lib/chef/knife/node_run_list_add.rb +1 -1
- data/lib/chef/knife/node_run_list_remove.rb +1 -1
- data/lib/chef/knife/node_run_list_set.rb +1 -1
- data/lib/chef/knife/node_show.rb +2 -2
- data/lib/chef/knife/role_env_run_list_add.rb +1 -1
- data/lib/chef/knife/role_env_run_list_set.rb +1 -1
- data/lib/chef/knife/role_run_list_add.rb +1 -1
- data/lib/chef/knife/role_run_list_set.rb +1 -1
- data/lib/chef/knife/search.rb +0 -1
- data/lib/chef/knife/serve.rb +3 -3
- data/lib/chef/knife/ssh.rb +24 -9
- data/lib/chef/knife/ssl_check.rb +3 -3
- data/lib/chef/knife/status.rb +2 -2
- data/lib/chef/knife/tag_create.rb +1 -1
- data/lib/chef/knife/tag_delete.rb +1 -1
- data/lib/chef/knife/user_create.rb +2 -2
- data/lib/chef/knife/xargs.rb +19 -19
- data/lib/chef/knife/yaml_convert.rb +1 -1
- data/lib/chef/local_mode.rb +2 -2
- data/lib/chef/log/syslog.rb +2 -2
- data/lib/chef/log/winevt.rb +2 -2
- data/lib/chef/mixin/checksum.rb +0 -1
- data/lib/chef/mixin/deep_merge.rb +35 -18
- data/lib/chef/mixin/openssl_helper.rb +4 -5
- data/lib/chef/mixin/shell_out.rb +1 -1
- data/lib/chef/mixin/template.rb +3 -3
- data/lib/chef/mixin/uris.rb +4 -2
- data/lib/chef/mixin/versioned_api.rb +1 -2
- data/lib/chef/mixin/which.rb +1 -1
- data/lib/chef/monkey_patches/net_http.rb +4 -4
- data/lib/chef/monkey_patches/webrick-utils.rb +10 -10
- data/lib/chef/node/attribute.rb +2 -4
- data/lib/chef/node_map.rb +4 -4
- data/lib/chef/platform/service_helpers.rb +1 -1
- data/lib/chef/policy_builder/dynamic.rb +2 -0
- data/lib/chef/policy_builder/policyfile.rb +2 -2
- data/lib/chef/property.rb +1 -1
- data/lib/chef/provider.rb +1 -5
- data/lib/chef/provider/cron/unix.rb +0 -2
- data/lib/chef/provider/file.rb +2 -2
- data/lib/chef/provider/git.rb +5 -5
- data/lib/chef/provider/group.rb +0 -2
- data/lib/chef/provider/group/suse.rb +5 -5
- data/lib/chef/provider/ifconfig.rb +1 -4
- data/lib/chef/provider/launchd.rb +2 -2
- data/lib/chef/provider/link.rb +0 -9
- data/lib/chef/provider/mount.rb +0 -2
- data/lib/chef/provider/mount/linux.rb +63 -0
- data/lib/chef/provider/package.rb +0 -2
- data/lib/chef/provider/package/dpkg.rb +3 -12
- data/lib/chef/provider/package/homebrew.rb +1 -1
- data/lib/chef/provider/package/rubygems.rb +22 -19
- data/lib/chef/provider/package/snap.rb +1 -2
- data/lib/chef/provider/package/windows.rb +2 -2
- data/lib/chef/provider/package/windows/registry_uninstall_entry.rb +12 -10
- data/lib/chef/provider/package/zypper.rb +1 -1
- data/lib/chef/provider/powershell_script.rb +21 -5
- data/lib/chef/provider/remote_file/content.rb +3 -0
- data/lib/chef/provider/remote_file/ftp.rb +6 -4
- data/lib/chef/provider/remote_file/sftp.rb +6 -4
- data/lib/chef/provider/route.rb +2 -6
- data/lib/chef/provider/service/arch.rb +1 -1
- data/lib/chef/provider/service/debian.rb +1 -1
- data/lib/chef/provider/service/gentoo.rb +2 -2
- data/lib/chef/provider/service/macosx.rb +4 -4
- data/lib/chef/provider/service/openbsd.rb +1 -4
- data/lib/chef/provider/service/redhat.rb +3 -3
- data/lib/chef/provider/service/upstart.rb +1 -1
- data/lib/chef/provider/service/windows.rb +10 -10
- data/lib/chef/provider/systemd_unit.rb +0 -2
- data/lib/chef/provider/template/content.rb +1 -0
- data/lib/chef/provider/template_finder.rb +2 -10
- data/lib/chef/provider/user/dscl.rb +7 -7
- data/lib/chef/provider/user/mac.rb +12 -12
- data/lib/chef/provider/windows_task.rb +1 -5
- data/lib/chef/provider/zypper_repository.rb +2 -3
- data/lib/chef/provider_resolver.rb +1 -1
- data/lib/chef/providers.rb +1 -1
- data/lib/chef/recipe.rb +2 -2
- data/lib/chef/resource.rb +8 -12
- data/lib/chef/resource/apt_repository.rb +5 -12
- data/lib/chef/resource/bff_package.rb +22 -0
- data/lib/chef/resource/breakpoint.rb +57 -2
- data/lib/chef/resource/build_essential.rb +1 -1
- data/lib/chef/resource/cab_package.rb +29 -0
- data/lib/chef/resource/chef_client_cron.rb +32 -25
- data/lib/chef/resource/chef_client_launchd.rb +194 -0
- data/lib/chef/resource/chef_client_scheduled_task.rb +21 -18
- data/lib/chef/resource/chef_client_systemd_timer.rb +26 -19
- data/lib/chef/resource/chef_client_trusted_certificate.rb +101 -0
- data/lib/chef/resource/chef_gem.rb +10 -10
- data/lib/chef/resource/chef_handler.rb +149 -4
- data/lib/chef/resource/chef_sleep.rb +2 -2
- data/lib/chef/resource/chef_vault_secret.rb +14 -14
- data/lib/chef/resource/cookbook_file.rb +2 -2
- data/lib/chef/resource/cron/_cron_shared.rb +1 -0
- data/lib/chef/resource/cron/cron_d.rb +0 -1
- data/lib/chef/resource/dnf_package.rb +2 -2
- data/lib/chef/resource/dsc_resource.rb +0 -1
- data/lib/chef/resource/dsc_script.rb +2 -2
- data/lib/chef/resource/execute.rb +8 -9
- data/lib/chef/resource/file.rb +4 -4
- data/lib/chef/resource/gem_package.rb +5 -5
- data/lib/chef/resource/homebrew_package.rb +3 -3
- data/lib/chef/resource/homebrew_update.rb +7 -7
- data/lib/chef/resource/hostname.rb +2 -2
- data/lib/chef/resource/launchd.rb +2 -1
- data/lib/chef/resource/locale.rb +2 -2
- data/lib/chef/resource/macos_userdefaults.rb +3 -3
- data/lib/chef/resource/notify_group.rb +0 -1
- data/lib/chef/resource/ohai.rb +46 -3
- data/lib/chef/resource/ohai_hint.rb +33 -0
- data/lib/chef/resource/openssl_dhparam.rb +29 -5
- data/lib/chef/resource/openssl_ec_private_key.rb +8 -3
- data/lib/chef/resource/openssl_ec_public_key.rb +4 -2
- data/lib/chef/resource/openssl_rsa_private_key.rb +8 -3
- data/lib/chef/resource/openssl_rsa_public_key.rb +2 -0
- data/lib/chef/resource/openssl_x509_certificate.rb +38 -35
- data/lib/chef/resource/openssl_x509_crl.rb +21 -10
- data/lib/chef/resource/openssl_x509_request.rb +37 -36
- data/lib/chef/resource/osx_profile.rb +292 -6
- data/lib/chef/resource/plist.rb +1 -1
- data/lib/chef/resource/powershell_package_source.rb +6 -6
- data/lib/chef/resource/powershell_script.rb +24 -30
- data/lib/chef/resource/reboot.rb +2 -2
- data/lib/chef/resource/remote_file.rb +3 -3
- data/lib/chef/resource/rhsm_register.rb +22 -10
- data/lib/chef/resource/ruby_block.rb +2 -2
- data/lib/chef/resource/scm/subversion.rb +2 -2
- data/lib/chef/resource/service.rb +3 -3
- data/lib/chef/resource/ssh_known_hosts_entry.rb +2 -2
- data/lib/chef/resource/sudo.rb +1 -1
- data/lib/chef/resource/support/cron.d.erb +1 -1
- data/lib/chef/resource/support/cron_access.erb +1 -1
- data/lib/chef/resource/support/sudoer.erb +1 -1
- data/lib/chef/resource/support/ulimit.erb +1 -1
- data/lib/chef/resource/sysctl.rb +6 -10
- data/lib/chef/resource/systemd_unit.rb +2 -2
- data/lib/chef/resource/template.rb +2 -2
- data/lib/chef/resource/timezone.rb +112 -73
- data/lib/chef/resource/windows_ad_join.rb +12 -3
- data/lib/chef/resource/windows_audit_policy.rb +3 -0
- data/lib/chef/resource/windows_auto_run.rb +2 -0
- data/lib/chef/resource/windows_certificate.rb +8 -4
- data/lib/chef/resource/windows_dfs_folder.rb +2 -0
- data/lib/chef/resource/windows_dfs_namespace.rb +2 -0
- data/lib/chef/resource/windows_dfs_server.rb +2 -0
- data/lib/chef/resource/windows_dns_record.rb +10 -7
- data/lib/chef/resource/windows_dns_zone.rb +12 -7
- data/lib/chef/resource/windows_feature.rb +2 -0
- data/lib/chef/resource/windows_feature_dism.rb +10 -0
- data/lib/chef/resource/windows_feature_powershell.rb +14 -2
- data/lib/chef/resource/windows_firewall_profile.rb +24 -20
- data/lib/chef/resource/windows_firewall_rule.rb +5 -3
- data/lib/chef/resource/windows_font.rb +3 -1
- data/lib/chef/resource/windows_package.rb +28 -5
- data/lib/chef/resource/windows_pagefile.rb +4 -0
- data/lib/chef/resource/windows_printer.rb +22 -21
- data/lib/chef/resource/windows_printer_port.rb +20 -17
- data/lib/chef/resource/windows_security_policy.rb +2 -0
- data/lib/chef/resource/windows_share.rb +5 -3
- data/lib/chef/resource/windows_shortcut.rb +2 -0
- data/lib/chef/resource/windows_uac.rb +2 -0
- data/lib/chef/resource/windows_user_privilege.rb +54 -53
- data/lib/chef/resource/windows_workgroup.rb +5 -6
- data/lib/chef/resource/yum_package.rb +2 -2
- data/lib/chef/resource_collection/stepable_iterator.rb +1 -2
- data/lib/chef/resource_reporter.rb +0 -2
- data/lib/chef/resources.rb +3 -1
- data/lib/chef/role.rb +2 -2
- data/lib/chef/run_context.rb +2 -2
- data/lib/chef/run_context/cookbook_compiler.rb +21 -21
- data/lib/chef/run_lock.rb +2 -2
- data/lib/chef/run_status.rb +2 -6
- data/lib/chef/search/query.rb +6 -5
- data/lib/chef/shell.rb +32 -27
- data/lib/chef/shell/ext.rb +11 -11
- data/lib/chef/shell/shell_session.rb +2 -2
- data/lib/chef/train_transport.rb +5 -104
- data/lib/chef/util/backup.rb +2 -2
- data/lib/chef/util/diff.rb +14 -14
- data/lib/chef/util/powershell/cmdlet.rb +4 -2
- data/lib/chef/util/powershell/ps_credential.rb +18 -14
- data/lib/chef/util/threaded_job_queue.rb +0 -2
- data/lib/chef/version.rb +1 -1
- data/lib/chef/win32/crypto.rb +1 -1
- data/lib/chef/win32/file.rb +3 -3
- data/lib/chef/win32/file/version_info.rb +5 -5
- data/lib/chef/win32/registry.rb +1 -2
- data/lib/chef/win32/unicode.rb +1 -1
- data/spec/data/shef-config.rb +1 -1
- data/spec/data/ssl/chef-rspec.cert +15 -15
- data/spec/functional/event_loggers/windows_eventlog_spec.rb +6 -5
- data/spec/functional/resource/aix_service_spec.rb +2 -2
- data/spec/functional/resource/aixinit_service_spec.rb +8 -8
- data/spec/functional/resource/bff_spec.rb +2 -2
- data/spec/functional/resource/cookbook_file_spec.rb +1 -1
- data/spec/functional/resource/dsc_resource_spec.rb +1 -1
- data/spec/functional/resource/dsc_script_spec.rb +0 -1
- data/spec/functional/resource/group_spec.rb +6 -6
- data/spec/functional/resource/insserv_spec.rb +5 -5
- data/spec/functional/resource/link_spec.rb +20 -20
- data/spec/functional/resource/powershell_script_spec.rb +4 -4
- data/spec/functional/resource/rpm_spec.rb +2 -2
- data/spec/functional/resource/user/dscl_spec.rb +1 -1
- data/spec/functional/resource/user/mac_user_spec.rb +1 -1
- data/spec/functional/resource/windows_certificate_spec.rb +3 -3
- data/spec/functional/resource/windows_font_spec.rb +49 -0
- data/spec/functional/resource/windows_security_policy_spec.rb +0 -3
- data/spec/functional/resource/windows_task_spec.rb +13 -13
- data/spec/functional/run_lock_spec.rb +24 -24
- data/spec/functional/version_spec.rb +3 -3
- data/spec/functional/win32/registry_spec.rb +8 -8
- data/spec/functional/win32/service_manager_spec.rb +1 -1
- data/spec/integration/client/client_spec.rb +4 -4
- data/spec/integration/client/exit_code_spec.rb +3 -2
- data/spec/integration/client/ipv6_spec.rb +1 -1
- data/spec/integration/knife/common_options_spec.rb +12 -12
- data/spec/integration/knife/config_list_spec.rb +220 -0
- data/spec/integration/knife/config_show_spec.rb +192 -0
- data/spec/integration/knife/config_use_spec.rb +198 -0
- data/spec/integration/knife/cookbook_api_ipv6_spec.rb +1 -1
- data/spec/integration/knife/diff_spec.rb +3 -1
- data/spec/integration/knife/download_spec.rb +3 -1
- data/spec/integration/knife/serve_spec.rb +5 -5
- data/spec/integration/knife/upload_spec.rb +3 -1
- data/spec/integration/ohai/ohai_spec.rb +61 -0
- data/spec/integration/recipes/lwrp_inline_resources_spec.rb +1 -1
- data/spec/integration/recipes/remote_directory.rb +1 -1
- data/spec/integration/solo/solo_spec.rb +5 -5
- data/spec/spec_helper.rb +12 -11
- data/spec/stress/win32/file_spec.rb +1 -1
- data/spec/support/chef_helpers.rb +2 -2
- data/spec/support/matchers/leak.rb +2 -2
- data/spec/support/platform_helpers.rb +17 -35
- data/spec/support/platforms/win32/spec_service.rb +1 -1
- data/spec/support/shared/functional/directory_resource.rb +1 -1
- data/spec/support/shared/functional/execute_resource.rb +1 -1
- data/spec/support/shared/functional/file_resource.rb +20 -20
- data/spec/support/shared/functional/securable_resource.rb +108 -27
- data/spec/support/shared/functional/win32_service.rb +2 -2
- data/spec/support/shared/functional/windows_script.rb +3 -3
- data/spec/support/shared/integration/integration_helper.rb +22 -52
- data/spec/support/shared/unit/application_dot_d.rb +5 -3
- data/spec/support/shared/unit/script_resource.rb +6 -20
- data/spec/support/shared/unit/windows_script_resource.rb +15 -28
- data/spec/tiny_server.rb +0 -1
- data/spec/unit/application/client_spec.rb +2 -2
- data/spec/unit/application/exit_code_spec.rb +10 -0
- data/spec/unit/application_spec.rb +4 -6
- data/spec/unit/chef_fs/config_spec.rb +1 -1
- data/spec/unit/chef_fs/data_handler/data_bag_item_data_handler.rb +1 -1
- data/spec/unit/chef_fs/parallelizer_spec.rb +5 -1
- data/spec/unit/chef_fs/path_util_spec.rb +1 -1
- data/spec/unit/cookbook/synchronizer_spec.rb +2 -2
- data/spec/unit/cookbook_spec.rb +2 -2
- data/spec/unit/data_collector/config_validation_spec.rb +208 -0
- data/spec/unit/data_collector_spec.rb +28 -117
- data/spec/unit/dsl/declare_resource_spec.rb +1 -1
- data/spec/unit/environment_spec.rb +7 -7
- data/spec/unit/file_access_control_spec.rb +1 -1
- data/spec/unit/knife/bootstrap_spec.rb +20 -20
- data/spec/unit/knife/cookbook_download_spec.rb +4 -4
- data/spec/unit/knife/cookbook_metadata_from_file_spec.rb +1 -1
- data/spec/unit/knife/core/hashed_command_loader_spec.rb +3 -3
- data/spec/unit/knife/core/ui_spec.rb +1 -0
- data/spec/unit/knife/core/windows_bootstrap_context_spec.rb +21 -12
- data/spec/unit/knife/ssh_spec.rb +2 -2
- data/spec/unit/knife/supermarket_share_spec.rb +1 -1
- data/spec/unit/lwrp_spec.rb +3 -3
- data/spec/unit/mixin/deep_merge_spec.rb +15 -0
- data/spec/unit/mixin/openssl_helper_spec.rb +1 -1
- data/spec/unit/mixin/powershell_exec_spec.rb +1 -1
- data/spec/unit/mixin/securable_spec.rb +2 -2
- data/spec/unit/mixin/template_spec.rb +30 -30
- data/spec/unit/mixin/windows_architecture_helper_spec.rb +4 -4
- data/spec/unit/node/immutable_collections_spec.rb +8 -4
- data/spec/unit/node_spec.rb +5 -5
- data/spec/unit/provider/mount/linux_spec.rb +97 -0
- data/spec/unit/provider/package/chocolatey_spec.rb +1 -1
- data/spec/unit/provider/package/powershell_spec.rb +1 -1
- data/spec/unit/provider/package/rubygems_spec.rb +4 -1
- data/spec/unit/provider/powershell_script_spec.rb +11 -4
- data/spec/unit/provider/remote_directory_spec.rb +9 -9
- data/spec/unit/provider/route_spec.rb +0 -2
- data/spec/unit/provider/service/arch_service_spec.rb +3 -2
- data/spec/unit/provider/service/debian_service_spec.rb +1 -1
- data/spec/unit/provider/service/gentoo_service_spec.rb +7 -7
- data/spec/unit/provider/service/macosx_spec.rb +3 -3
- data/spec/unit/provider/service/redhat_spec.rb +2 -2
- data/spec/unit/provider/service/upstart_service_spec.rb +3 -3
- data/spec/unit/provider_resolver_spec.rb +6 -6
- data/spec/unit/recipe_spec.rb +1 -1
- data/spec/unit/resource/batch_spec.rb +6 -6
- data/spec/unit/resource/chef_client_cron_spec.rb +35 -14
- data/spec/unit/resource/chef_client_launchd_spec.rb +127 -0
- data/spec/unit/resource/chef_client_systemd_timer_spec.rb +36 -1
- data/spec/unit/resource/chef_client_trusted_certificate_spec.rb +54 -0
- data/spec/unit/resource/execute_spec.rb +113 -118
- data/spec/unit/resource/launchd_spec.rb +8 -0
- data/spec/unit/resource/osx_profile_spec.rb +299 -0
- data/spec/unit/resource/powershell_script_spec.rb +11 -29
- data/spec/unit/resource/rhsm_register_spec.rb +56 -18
- data/spec/unit/resource/script_spec.rb +6 -1
- data/spec/unit/resource/timezone_spec.rb +63 -0
- data/spec/unit/resource/windows_feature_powershell_spec.rb +30 -4
- data/spec/unit/resource/windows_uac_spec.rb +1 -1
- data/spec/unit/resource/windows_user_privilege_spec.rb +55 -0
- data/spec/unit/role_spec.rb +11 -11
- data/spec/unit/run_lock_spec.rb +5 -1
- data/spec/unit/runner_spec.rb +1 -2
- data/spec/unit/shell/shell_ext_spec.rb +46 -3
- data/spec/unit/shell/shell_session_spec.rb +35 -64
- data/spec/unit/shell_spec.rb +16 -19
- data/spec/unit/train_transport_spec.rb +14 -13
- data/spec/unit/util/selinux_spec.rb +2 -0
- data/tasks/rspec.rb +1 -3
- metadata +42 -33
- data/lib/chef/dist.rb +0 -68
- data/lib/chef/provider/osx_profile.rb +0 -255
- data/spec/integration/knife/config_get_profile_spec.rb +0 -113
- data/spec/integration/knife/config_get_spec.rb +0 -191
- data/spec/integration/knife/config_list_profiles_spec.rb +0 -218
- data/spec/integration/knife/config_use_profile_spec.rb +0 -154
- data/spec/unit/provider/osx_profile_spec.rb +0 -255
@@ -33,6 +33,12 @@ describe Chef::Resource::ChefClientSystemdTimer do
|
|
33
33
|
expect(resource.user).to eql("root")
|
34
34
|
end
|
35
35
|
|
36
|
+
it "validates the cpu_quota property input" do
|
37
|
+
expect { resource.cpu_quota(0) }.to raise_error(Chef::Exceptions::ValidationFailed)
|
38
|
+
expect { resource.cpu_quota(50) }.not_to raise_error
|
39
|
+
expect { resource.cpu_quota(101) }.not_to raise_error
|
40
|
+
end
|
41
|
+
|
36
42
|
it "builds a default value for chef_binary_path dist values" do
|
37
43
|
expect(resource.chef_binary_path).to eql("/opt/chef/bin/chef-client")
|
38
44
|
end
|
@@ -70,4 +76,33 @@ describe Chef::Resource::ChefClientSystemdTimer do
|
|
70
76
|
expect(provider.chef_client_cmd).to eql("/opt/chef/bin/chef-client --chef-license accept -c #{root_path}")
|
71
77
|
end
|
72
78
|
end
|
73
|
-
|
79
|
+
|
80
|
+
describe "#service_content" do
|
81
|
+
it "does not set ConditionACPower if run_on_battery property is set to true (the default)" do
|
82
|
+
expect(provider.service_content["Service"]).not_to have_key("ConditionACPower")
|
83
|
+
end
|
84
|
+
|
85
|
+
it "sets ConditionACPower if run_on_battery property is set to false" do
|
86
|
+
resource.run_on_battery false
|
87
|
+
expect(provider.service_content["Service"]["ConditionACPower"]).to eq("true")
|
88
|
+
end
|
89
|
+
|
90
|
+
it "does not set Environment if environment property is empty" do
|
91
|
+
expect(provider.service_content["Service"]).not_to have_key("Environment")
|
92
|
+
end
|
93
|
+
|
94
|
+
it "sets Environment if environment property is set" do
|
95
|
+
resource.environment({ "foo" => "bar" })
|
96
|
+
expect(provider.service_content["Service"]["Environment"]).to eq(["\"foo=bar\""])
|
97
|
+
end
|
98
|
+
|
99
|
+
it "does not set CPUQuota if cpu_quota property is not set" do
|
100
|
+
expect(provider.service_content["Service"]).not_to have_key("CPUQuota")
|
101
|
+
end
|
102
|
+
|
103
|
+
it "sets CPUQuota if cpu_quota property is set" do
|
104
|
+
resource.cpu_quota 50
|
105
|
+
expect(provider.service_content["Service"]["CPUQuota"]).to eq(50)
|
106
|
+
end
|
107
|
+
end
|
108
|
+
end
|
@@ -0,0 +1,54 @@
|
|
1
|
+
#
|
2
|
+
# Copyright:: Copyright (c) Chef Software Inc.
|
3
|
+
# License:: Apache License, Version 2.0
|
4
|
+
#
|
5
|
+
# Licensed under the Apache License, Version 2.0 (the "License");
|
6
|
+
# you may not use this file except in compliance with the License.
|
7
|
+
# You may obtain a copy of the License at
|
8
|
+
#
|
9
|
+
# http://www.apache.org/licenses/LICENSE-2.0
|
10
|
+
#
|
11
|
+
# Unless required by applicable law or agreed to in writing, software
|
12
|
+
# distributed under the License is distributed on an "AS IS" BASIS,
|
13
|
+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
14
|
+
# See the License for the specific language governing permissions and
|
15
|
+
# limitations under the License.
|
16
|
+
#
|
17
|
+
|
18
|
+
require "spec_helper"
|
19
|
+
|
20
|
+
describe Chef::Resource::ChefClientTrustedCertificate do
|
21
|
+
let(:node) { Chef::Node.new }
|
22
|
+
let(:events) { Chef::EventDispatch::Dispatcher.new }
|
23
|
+
let(:run_context) { Chef::RunContext.new(node, {}, events) }
|
24
|
+
let(:resource) { Chef::Resource::ChefClientTrustedCertificate.new("foo", run_context) }
|
25
|
+
let(:provider) { resource.provider_for_action(:add) }
|
26
|
+
|
27
|
+
it "has a resource name of :chef_client_trusted_certificate" do
|
28
|
+
expect(resource.resource_name).to eql(:chef_client_trusted_certificate)
|
29
|
+
end
|
30
|
+
|
31
|
+
it "has a name property of cert_name" do
|
32
|
+
expect(resource.cert_name).to eql("foo")
|
33
|
+
end
|
34
|
+
|
35
|
+
it "sets the default action as :add" do
|
36
|
+
expect(resource.action).to eql([:add])
|
37
|
+
end
|
38
|
+
|
39
|
+
it "supports :remove action" do
|
40
|
+
expect { resource.action :remove }.not_to raise_error
|
41
|
+
end
|
42
|
+
|
43
|
+
describe "#cert_path" do
|
44
|
+
it "appends .pem to new_resource.cert_name value" do
|
45
|
+
resource.cert_name "something"
|
46
|
+
expect(provider.cert_path).to match(%r{trusted_certs/something.pem$})
|
47
|
+
end
|
48
|
+
|
49
|
+
it "does not append .pem if cert_name already ends in .pem" do
|
50
|
+
resource.cert_name "something.pem"
|
51
|
+
expect(provider.cert_path).to match(%r{trusted_certs/something.pem$})
|
52
|
+
end
|
53
|
+
end
|
54
|
+
end
|
@@ -116,172 +116,167 @@ describe Chef::Resource::Execute do
|
|
116
116
|
end
|
117
117
|
end
|
118
118
|
|
119
|
-
|
120
|
-
|
121
|
-
|
122
|
-
|
123
|
-
end
|
124
|
-
|
125
|
-
context "when no user, domain, or password is specified" do
|
126
|
-
let(:username) { nil }
|
127
|
-
let(:domain) { nil }
|
128
|
-
let(:password) { nil }
|
129
|
-
it_behaves_like "it received valid credentials"
|
130
|
-
end
|
131
|
-
|
132
|
-
context "when a valid username is specified" do
|
133
|
-
let(:username) { "starchild" }
|
134
|
-
let(:elevated) { false }
|
135
|
-
context "when a valid domain is specified" do
|
136
|
-
let(:domain) { "mothership" }
|
137
|
-
|
138
|
-
context "when the password is not specified" do
|
139
|
-
let(:password) { nil }
|
140
|
-
it_behaves_like "it received invalid credentials"
|
141
|
-
end
|
142
|
-
|
143
|
-
context "when the password is specified" do
|
144
|
-
let(:password) { "we.funk!" }
|
145
|
-
it_behaves_like "it received valid credentials"
|
146
|
-
end
|
147
|
-
end
|
119
|
+
context "when running on Windows" do
|
120
|
+
before do
|
121
|
+
allow(resource).to receive(:windows?).and_return(true)
|
122
|
+
end
|
148
123
|
|
149
|
-
|
150
|
-
|
151
|
-
|
124
|
+
context "when no user, domain, or password is specified" do
|
125
|
+
let(:username) { nil }
|
126
|
+
let(:domain) { nil }
|
127
|
+
let(:password) { nil }
|
128
|
+
it_behaves_like "it received valid credentials"
|
129
|
+
end
|
152
130
|
|
153
|
-
|
154
|
-
|
155
|
-
|
156
|
-
|
131
|
+
context "when a valid username is specified" do
|
132
|
+
let(:username) { "starchild" }
|
133
|
+
let(:elevated) { false }
|
134
|
+
context "when a valid domain is specified" do
|
135
|
+
let(:domain) { "mothership" }
|
157
136
|
|
158
|
-
|
159
|
-
|
160
|
-
|
161
|
-
end
|
137
|
+
context "when the password is not specified" do
|
138
|
+
let(:password) { nil }
|
139
|
+
it_behaves_like "it received invalid credentials"
|
162
140
|
end
|
163
141
|
|
164
|
-
context "when
|
165
|
-
let(:
|
166
|
-
|
167
|
-
context "when domain is specified" do
|
168
|
-
let(:domain) { "mothership" }
|
169
|
-
let(:password) { nil }
|
170
|
-
it_behaves_like "it received invalid username and domain"
|
171
|
-
end
|
172
|
-
|
173
|
-
context "when password is specified" do
|
174
|
-
let(:domain) { nil }
|
175
|
-
let(:password) { "we.funk!" }
|
176
|
-
it_behaves_like "it received invalid username and domain"
|
177
|
-
end
|
142
|
+
context "when the password is specified" do
|
143
|
+
let(:password) { "we.funk!" }
|
144
|
+
it_behaves_like "it received valid credentials"
|
178
145
|
end
|
179
146
|
end
|
180
147
|
|
181
|
-
context "when
|
182
|
-
let(:username) { "user@domain@domain" }
|
148
|
+
context "when the domain is not specified" do
|
183
149
|
let(:domain) { nil }
|
184
|
-
let(:
|
185
|
-
it_behaves_like "it received invalid username and domain"
|
186
|
-
end
|
187
|
-
|
188
|
-
context "when the domain is provided in both username and domain" do
|
189
|
-
let(:domain) { "some_domain" }
|
190
|
-
let(:password) { "we.funk!" }
|
150
|
+
let(:elevated) { false }
|
191
151
|
|
192
|
-
context "when
|
193
|
-
let(:
|
194
|
-
it_behaves_like "it received invalid
|
152
|
+
context "when the password is not specified" do
|
153
|
+
let(:password) { nil }
|
154
|
+
it_behaves_like "it received invalid credentials"
|
195
155
|
end
|
196
156
|
|
197
|
-
context "when
|
198
|
-
let(:
|
199
|
-
it_behaves_like "it received
|
157
|
+
context "when the password is specified" do
|
158
|
+
let(:password) { "we.funk!" }
|
159
|
+
it_behaves_like "it received valid credentials"
|
200
160
|
end
|
201
161
|
end
|
202
162
|
|
203
|
-
context "when
|
204
|
-
let(:
|
163
|
+
context "when username is not specified" do
|
164
|
+
let(:username) { nil }
|
205
165
|
|
206
|
-
context "when
|
207
|
-
let(:
|
208
|
-
let(:domain) { nil }
|
166
|
+
context "when domain is specified" do
|
167
|
+
let(:domain) { "mothership" }
|
209
168
|
let(:password) { nil }
|
210
|
-
it_behaves_like "it received invalid
|
169
|
+
it_behaves_like "it received invalid username and domain"
|
211
170
|
end
|
212
171
|
|
213
|
-
context "when
|
214
|
-
let(:username) { "user" }
|
172
|
+
context "when password is specified" do
|
215
173
|
let(:domain) { nil }
|
216
174
|
let(:password) { "we.funk!" }
|
217
|
-
it_behaves_like "it received
|
175
|
+
it_behaves_like "it received invalid username and domain"
|
218
176
|
end
|
219
177
|
end
|
220
178
|
end
|
221
179
|
|
222
|
-
context "when
|
223
|
-
|
224
|
-
|
180
|
+
context "when invalid username is specified" do
|
181
|
+
let(:username) { "user@domain@domain" }
|
182
|
+
let(:domain) { nil }
|
183
|
+
let(:password) { "we.funk!" }
|
184
|
+
it_behaves_like "it received invalid username and domain"
|
185
|
+
end
|
186
|
+
|
187
|
+
context "when the domain is provided in both username and domain" do
|
188
|
+
let(:domain) { "some_domain" }
|
189
|
+
let(:password) { "we.funk!" }
|
190
|
+
|
191
|
+
context "when username is in the form domain\\user" do
|
192
|
+
let(:username) { "mothership\\starchild" }
|
193
|
+
it_behaves_like "it received invalid username and domain"
|
194
|
+
end
|
195
|
+
|
196
|
+
context "when username is in the form user@domain" do
|
197
|
+
let(:username) { "starchild@mothership" }
|
198
|
+
it_behaves_like "it received invalid username and domain"
|
225
199
|
end
|
200
|
+
end
|
226
201
|
|
227
|
-
|
202
|
+
context "when elevated is passed" do
|
203
|
+
let(:elevated) { true }
|
204
|
+
|
205
|
+
context "when username and password are not passed" do
|
228
206
|
let(:username) { nil }
|
229
207
|
let(:domain) { nil }
|
230
208
|
let(:password) { nil }
|
209
|
+
it_behaves_like "it received invalid credentials"
|
210
|
+
end
|
211
|
+
|
212
|
+
context "when username and password are passed" do
|
213
|
+
let(:username) { "user" }
|
214
|
+
let(:domain) { nil }
|
215
|
+
let(:password) { "we.funk!" }
|
231
216
|
it_behaves_like "it received valid credentials"
|
232
217
|
end
|
218
|
+
end
|
219
|
+
end
|
220
|
+
|
221
|
+
context "when not running on Windows" do
|
222
|
+
before do
|
223
|
+
allow(resource).to receive(:node).and_return({ platform_family: "ubuntu" })
|
224
|
+
end
|
225
|
+
|
226
|
+
context "when no user, domain, or password is specified" do
|
227
|
+
let(:username) { nil }
|
228
|
+
let(:domain) { nil }
|
229
|
+
let(:password) { nil }
|
230
|
+
it_behaves_like "it received valid credentials"
|
231
|
+
end
|
232
|
+
|
233
|
+
context "when the user is specified and the domain and password are not" do
|
234
|
+
let(:username) { "starchild" }
|
235
|
+
let(:domain) { nil }
|
236
|
+
let(:password) { nil }
|
237
|
+
it_behaves_like "it received valid credentials"
|
233
238
|
|
234
|
-
context "when the
|
235
|
-
let(:
|
239
|
+
context "when the password is specified and the domain is not" do
|
240
|
+
let(:password) { "we.funk!" }
|
236
241
|
let(:domain) { nil }
|
242
|
+
it_behaves_like "it received credentials that are not valid on the platform"
|
243
|
+
end
|
244
|
+
|
245
|
+
context "when the domain is specified and the password is not" do
|
246
|
+
let(:domain) { "mothership" }
|
237
247
|
let(:password) { nil }
|
238
|
-
it_behaves_like "it received valid
|
248
|
+
it_behaves_like "it received credentials that are not valid on the platform"
|
249
|
+
end
|
250
|
+
|
251
|
+
context "when the domain and password are specified" do
|
252
|
+
let(:domain) { "mothership" }
|
253
|
+
let(:password) { "we.funk!" }
|
254
|
+
it_behaves_like "it received credentials that are not valid on the platform"
|
255
|
+
end
|
256
|
+
end
|
239
257
|
|
240
|
-
|
258
|
+
context "when the user is not specified" do
|
259
|
+
let(:username) { nil }
|
260
|
+
context "when the domain is specified" do
|
261
|
+
let(:domain) { "mothership" }
|
262
|
+
context "when the password is specified" do
|
241
263
|
let(:password) { "we.funk!" }
|
242
|
-
let(:domain) { nil }
|
243
264
|
it_behaves_like "it received credentials that are not valid on the platform"
|
244
265
|
end
|
245
266
|
|
246
|
-
context "when
|
247
|
-
let(:domain) { "mothership" }
|
267
|
+
context "when password is not specified" do
|
248
268
|
let(:password) { nil }
|
249
269
|
it_behaves_like "it received credentials that are not valid on the platform"
|
250
270
|
end
|
271
|
+
end
|
251
272
|
|
252
|
-
|
253
|
-
|
273
|
+
context "when the domain is not specified" do
|
274
|
+
let(:domain) { nil }
|
275
|
+
context "when the password is specified" do
|
254
276
|
let(:password) { "we.funk!" }
|
255
277
|
it_behaves_like "it received credentials that are not valid on the platform"
|
256
278
|
end
|
257
279
|
end
|
258
|
-
|
259
|
-
context "when the user is not specified" do
|
260
|
-
let(:username) { nil }
|
261
|
-
context "when the domain is specified" do
|
262
|
-
let(:domain) { "mothership" }
|
263
|
-
context "when the password is specified" do
|
264
|
-
let(:password) { "we.funk!" }
|
265
|
-
it_behaves_like "it received credentials that are not valid on the platform"
|
266
|
-
end
|
267
|
-
|
268
|
-
context "when password is not specified" do
|
269
|
-
let(:password) { nil }
|
270
|
-
it_behaves_like "it received credentials that are not valid on the platform"
|
271
|
-
end
|
272
|
-
end
|
273
|
-
|
274
|
-
context "when the domain is not specified" do
|
275
|
-
let(:domain) { nil }
|
276
|
-
context "when the password is specified" do
|
277
|
-
let(:password) { "we.funk!" }
|
278
|
-
it_behaves_like "it received credentials that are not valid on the platform"
|
279
|
-
end
|
280
|
-
end
|
281
|
-
end
|
282
280
|
end
|
283
281
|
end
|
284
|
-
|
285
|
-
it_behaves_like "a consumer of the Execute resource"
|
286
|
-
|
287
282
|
end
|
@@ -37,4 +37,12 @@ describe Chef::Resource::Launchd do
|
|
37
37
|
expect { resource.action :enable }.not_to raise_error
|
38
38
|
expect { resource.action :restart }.not_to raise_error
|
39
39
|
end
|
40
|
+
|
41
|
+
it "raises an error if nice is less than -20" do
|
42
|
+
expect { resource.nice(-21) }.to raise_error(Chef::Exceptions::ValidationFailed)
|
43
|
+
end
|
44
|
+
|
45
|
+
it "raises an error if nice is greater than 19" do
|
46
|
+
expect { resource.nice(20) }.to raise_error(Chef::Exceptions::ValidationFailed)
|
47
|
+
end
|
40
48
|
end
|
@@ -58,4 +58,303 @@ 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
|
+
let(:profile_raw_xml) do
|
106
|
+
<<~OUT
|
107
|
+
<?xml version="1.0" encoding="UTF-8"?>
|
108
|
+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
|
109
|
+
<plist version="1.0">
|
110
|
+
<dict>
|
111
|
+
<key>tsmith</key>
|
112
|
+
<array>
|
113
|
+
<dict>
|
114
|
+
<key>ProfileDisplayName</key>
|
115
|
+
<string>Screensaver Settings</string>
|
116
|
+
<key>ProfileIdentifier</key>
|
117
|
+
<string>com.company.screensaver</string>
|
118
|
+
<key>ProfileInstallDate</key>
|
119
|
+
<string>2020-09-17 17:20:49 +0000</string>
|
120
|
+
<key>ProfileItems</key>
|
121
|
+
<array>
|
122
|
+
<dict>
|
123
|
+
<key>PayloadContent</key>
|
124
|
+
<dict>
|
125
|
+
<key>PayloadContentManagedPreferences</key>
|
126
|
+
<dict>
|
127
|
+
<key>com.apple.screensaver</key>
|
128
|
+
<dict>
|
129
|
+
<key>Forced</key>
|
130
|
+
<array>
|
131
|
+
<dict>
|
132
|
+
<key>mcx_preference_settings</key>
|
133
|
+
<dict>
|
134
|
+
<key>idleTime</key>
|
135
|
+
<integer>0</integer>
|
136
|
+
</dict>
|
137
|
+
</dict>
|
138
|
+
</array>
|
139
|
+
</dict>
|
140
|
+
</dict>
|
141
|
+
</dict>
|
142
|
+
<key>PayloadDisplayName</key>
|
143
|
+
<string>com.apple.screensaver</string>
|
144
|
+
<key>PayloadIdentifier</key>
|
145
|
+
<string>com.company.screensaver</string>
|
146
|
+
<key>PayloadType</key>
|
147
|
+
<string>com.apple.ManagedClient.preferences</string>
|
148
|
+
<key>PayloadUUID</key>
|
149
|
+
<string>73fc30e0-1e57-0131-c32d-000c2944c108</string>
|
150
|
+
<key>PayloadVersion</key>
|
151
|
+
<integer>1</integer>
|
152
|
+
</dict>
|
153
|
+
</array>
|
154
|
+
<key>ProfileOrganization</key>
|
155
|
+
<string>Chef</string>
|
156
|
+
<key>ProfileType</key>
|
157
|
+
<string>Configuration</string>
|
158
|
+
<key>ProfileUUID</key>
|
159
|
+
<string>ed5e36c8-ea0b-5960-8f49-3c7d9121687e</string>
|
160
|
+
<key>ProfileVersion</key>
|
161
|
+
<integer>1</integer>
|
162
|
+
</dict>
|
163
|
+
</array>
|
164
|
+
</dict>
|
165
|
+
</plist>
|
166
|
+
OUT
|
167
|
+
end
|
168
|
+
let(:shell_out_profiles) do
|
169
|
+
double("shell_out", exitstatus: 0, error?: false, stdout: profile_raw_xml)
|
170
|
+
end
|
171
|
+
# If anything is changed within this profile, be sure to update the
|
172
|
+
# ProfileUUID in all_profiles to match the new config specific UUID
|
173
|
+
let(:test_profile) do
|
174
|
+
{
|
175
|
+
"PayloadIdentifier" => "com.testprofile.screensaver",
|
176
|
+
"PayloadRemovalDisallowed" => false,
|
177
|
+
"PayloadScope" => "System",
|
178
|
+
"PayloadType" => "Configuration",
|
179
|
+
"PayloadUUID" => "1781fbec-3325-565f-9022-8aa28135c3cc",
|
180
|
+
"PayloadOrganization" => "Chef",
|
181
|
+
"PayloadVersion" => 1,
|
182
|
+
"PayloadDisplayName" => "Screensaver Settings",
|
183
|
+
"PayloadContent" => [
|
184
|
+
{
|
185
|
+
"PayloadType" => "com.apple.ManagedClient.preferences",
|
186
|
+
"PayloadVersion" => 1,
|
187
|
+
"PayloadIdentifier" => "com.testprofile.screensaver",
|
188
|
+
"PayloadUUID" => "73fc30e0-1e57-0131-c32d-000c2944c108",
|
189
|
+
"PayloadEnabled" => true,
|
190
|
+
"PayloadDisplayName" => "com.apple.screensaver",
|
191
|
+
"PayloadContent" => {
|
192
|
+
"com.apple.screensaver" => {
|
193
|
+
"Forced" => [
|
194
|
+
{
|
195
|
+
"mcx_preference_settings" => {
|
196
|
+
"idleTime" => 0,
|
197
|
+
},
|
198
|
+
},
|
199
|
+
],
|
200
|
+
},
|
201
|
+
},
|
202
|
+
},
|
203
|
+
],
|
204
|
+
}
|
205
|
+
end
|
206
|
+
let(:no_profiles) do
|
207
|
+
{}
|
208
|
+
end
|
209
|
+
|
210
|
+
before(:each) do
|
211
|
+
allow(provider).to receive(:cookbook_file_available?).and_return(true)
|
212
|
+
allow(provider).to receive(:cache_cookbook_profile).and_return("/tmp/test.mobileconfig.remote")
|
213
|
+
allow(provider).to receive(:get_new_profile_hash).and_return(test_profile)
|
214
|
+
allow(provider).to receive(:get_installed_profiles).and_return(all_profiles)
|
215
|
+
allow(provider).to receive(:read_plist).and_return(all_profiles)
|
216
|
+
allow(::File).to receive(:unlink).and_return(true)
|
217
|
+
end
|
218
|
+
|
219
|
+
it "should build the get all profiles shellout command correctly" do
|
220
|
+
profile_name = "com.testprofile.screensaver.mobileconfig"
|
221
|
+
resource.profile_name profile_name
|
222
|
+
allow(provider).to receive(:get_installed_profiles).and_call_original
|
223
|
+
allow(provider).to receive(:read_plist).and_return(all_profiles)
|
224
|
+
expect(provider).to receive(:shell_out_compacted).with("/usr/bin/profiles", "-P", "-o", "stdout-xml").and_return(shell_out_profiles)
|
225
|
+
provider.load_current_resource
|
226
|
+
end
|
227
|
+
|
228
|
+
it "should use profile name as profile when no profile is set" do
|
229
|
+
profile_name = "com.testprofile.screensaver.mobileconfig"
|
230
|
+
resource.profile_name profile_name
|
231
|
+
provider.load_current_resource
|
232
|
+
expect(resource.profile_name).to eql(profile_name)
|
233
|
+
end
|
234
|
+
|
235
|
+
it "should use identifier from specified profile" do
|
236
|
+
resource.profile test_profile
|
237
|
+
provider.load_current_resource
|
238
|
+
expect(
|
239
|
+
provider.instance_variable_get(:@new_profile_identifier)
|
240
|
+
).to eql(test_profile["PayloadIdentifier"])
|
241
|
+
end
|
242
|
+
|
243
|
+
it "should install when not installed" do
|
244
|
+
resource.profile test_profile
|
245
|
+
allow(provider).to receive(:get_installed_profiles).and_return(no_profiles)
|
246
|
+
provider.load_current_resource
|
247
|
+
expect(provider).to receive(:install_profile)
|
248
|
+
expect { provider.run_action(:install) }.to_not raise_error
|
249
|
+
end
|
250
|
+
|
251
|
+
it "does not install if the profile is already installed" do
|
252
|
+
resource.profile test_profile
|
253
|
+
allow(provider).to receive(:get_installed_profiles).and_return(all_profiles)
|
254
|
+
provider.load_current_resource
|
255
|
+
expect(provider).to_not receive(:install_profile)
|
256
|
+
expect { provider.action_install }.to_not raise_error
|
257
|
+
end
|
258
|
+
|
259
|
+
it "should install when installed but uuid differs" do
|
260
|
+
resource.profile test_profile
|
261
|
+
all_profiles["_computerlevel"][1]["ProfileUUID"] = "1781fbec-3325-565f-9022-9bb39245d4dd"
|
262
|
+
provider.load_current_resource
|
263
|
+
expect(provider).to receive(:install_profile)
|
264
|
+
expect { provider.run_action(:install) }.to_not raise_error
|
265
|
+
end
|
266
|
+
|
267
|
+
it "should build the shellout install command correctly" do
|
268
|
+
profile_path = "/tmp/test.mobileconfig"
|
269
|
+
resource.profile test_profile
|
270
|
+
# Change the profile so it triggers an install
|
271
|
+
all_profiles["_computerlevel"][1]["ProfileUUID"] = "1781fbec-3325-565f-9022-9bb39245d4dd"
|
272
|
+
provider.load_current_resource
|
273
|
+
allow(provider).to receive(:write_profile_to_disk).and_return(profile_path)
|
274
|
+
expect(provider).to receive(:shell_out_compacted!).with("/usr/bin/profiles", "-I", "-F", profile_path).and_return(shell_out_success)
|
275
|
+
provider.action_install
|
276
|
+
end
|
277
|
+
|
278
|
+
it "should fail if there is no identifier inside the profile" do
|
279
|
+
test_profile.delete("PayloadIdentifier")
|
280
|
+
resource.profile test_profile
|
281
|
+
error_message = "The specified profile does not seem to be valid"
|
282
|
+
expect { provider.run_action(:install) }.to raise_error(RuntimeError, error_message)
|
283
|
+
end
|
284
|
+
end
|
285
|
+
|
286
|
+
describe "action_remove" do
|
287
|
+
let(:node) { Chef::Node.new }
|
288
|
+
let(:events) { Chef::EventDispatch::Dispatcher.new }
|
289
|
+
let(:run_context) { Chef::RunContext.new(node, {}, events) }
|
290
|
+
let(:resource) { Chef::Resource::OsxProfile.new("Profile Test", run_context) }
|
291
|
+
let(:provider) { resource.provider_for_action(:remove) }
|
292
|
+
let(:current_resource) { Chef::Resource::OsxProfile.new("Profile Test") }
|
293
|
+
let(:all_profiles) do
|
294
|
+
{ "_computerlevel" => [{ "ProfileDisplayName" => "ScreenSaver Settings",
|
295
|
+
"ProfileIdentifier" => "com.apple.screensaver",
|
296
|
+
"ProfileInstallDate" => "2015-10-05 23:15:21 +0000",
|
297
|
+
"ProfileItems" => [{ "PayloadContent" => { "PayloadContentManagedPreferences" => { "com.apple.screensaver" => { "Forced" => [{ "mcx_preference_settings" => { "idleTime" => 0 } }] } } },
|
298
|
+
"PayloadDisplayName" => "Custom: (com.apple.screensaver)",
|
299
|
+
"PayloadIdentifier" => "com.apple.screensaver",
|
300
|
+
"PayloadType" => "com.apple.ManagedClient.preferences",
|
301
|
+
"PayloadUUID" => "73fc30e0-1e57-0131-c32d-000c2944c108",
|
302
|
+
"PayloadVersion" => 1 }],
|
303
|
+
"ProfileOrganization" => "Chef",
|
304
|
+
"ProfileRemovalDisallowed" => "false",
|
305
|
+
"ProfileType" => "Configuration",
|
306
|
+
"ProfileUUID" => "1781fbec-3325-565f-9022-8aa28135c3cc",
|
307
|
+
"ProfileVerificationState" => "unsigned",
|
308
|
+
"ProfileVersion" => 1 },
|
309
|
+
{ "ProfileDisplayName" => "ScreenSaver Settings",
|
310
|
+
"ProfileIdentifier" => "com.testprofile.screensaver",
|
311
|
+
"ProfileInstallDate" => "2015-10-05 23:15:21 +0000",
|
312
|
+
"ProfileItems" => [{ "PayloadContent" => { "PayloadContentManagedPreferences" => { "com.apple.screensaver" => { "Forced" => [{ "mcx_preference_settings" => { "idleTime" => 0 } }] } } },
|
313
|
+
"PayloadDisplayName" => "Custom: (com.apple.screensaver)",
|
314
|
+
"PayloadIdentifier" => "com.apple.screensaver",
|
315
|
+
"PayloadType" => "com.apple.ManagedClient.preferences",
|
316
|
+
"PayloadUUID" => "73fc30e0-1e57-0131-c32d-000c2944c110",
|
317
|
+
"PayloadVersion" => 1 }],
|
318
|
+
"ProfileOrganization" => "Chef",
|
319
|
+
"ProfileRemovalDisallowed" => "false",
|
320
|
+
"ProfileType" => "Configuration",
|
321
|
+
"ProfileUUID" => "1781fbec-3325-565f-9022-8aa28135c3cc",
|
322
|
+
"ProfileVerificationState" => "unsigned",
|
323
|
+
"ProfileVersion" => 1 }],
|
324
|
+
}
|
325
|
+
end
|
326
|
+
|
327
|
+
before(:each) do
|
328
|
+
provider.current_resource = current_resource
|
329
|
+
allow(provider).to receive(:get_installed_profiles).and_return(all_profiles)
|
330
|
+
end
|
331
|
+
|
332
|
+
it "should use resource name for identifier when not specified" do
|
333
|
+
resource.profile_name "com.testprofile.screensaver"
|
334
|
+
resource.action(:remove)
|
335
|
+
provider.load_current_resource
|
336
|
+
expect(provider.instance_variable_get(:@new_profile_identifier)).to eql(resource.profile_name)
|
337
|
+
end
|
338
|
+
|
339
|
+
it "should use specified identifier" do
|
340
|
+
resource.identifier "com.testprofile.screensaver"
|
341
|
+
resource.action(:remove)
|
342
|
+
provider.load_current_resource
|
343
|
+
expect(provider.instance_variable_get(:@new_profile_identifier)).to eql(resource.identifier)
|
344
|
+
end
|
345
|
+
|
346
|
+
it "should work with spaces in the identifier" do
|
347
|
+
provider.action = :remove
|
348
|
+
provider.define_resource_requirements
|
349
|
+
expect { provider.process_resource_requirements }.not_to raise_error
|
350
|
+
end
|
351
|
+
|
352
|
+
it "should build the shellout remove command correctly" do
|
353
|
+
resource.identifier "com.testprofile.screensaver"
|
354
|
+
resource.action(:remove)
|
355
|
+
provider.load_current_resource
|
356
|
+
expect(provider).to receive(:shell_out_compacted!).with("/usr/bin/profiles", "-R", "-p", resource.identifier).and_return(shell_out_success)
|
357
|
+
provider.action_remove
|
358
|
+
end
|
359
|
+
end
|
61
360
|
end
|