chef 15.11.3-universal-mingw32 → 16.1.16-universal-mingw32
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/Gemfile +3 -7
- data/README.md +1 -1
- data/Rakefile +44 -16
- data/chef.gemspec +6 -4
- data/distro/powershell/chef/chef.psm1 +3 -3
- data/distro/templates/powershell/chef/chef.psm1.erb +3 -3
- data/lib/chef/action_collection.rb +16 -5
- data/lib/chef/application.rb +33 -54
- data/lib/chef/application/apply.rb +18 -1
- data/lib/chef/application/base.rb +8 -3
- data/lib/chef/application/knife.rb +1 -1
- data/lib/chef/chef_class.rb +4 -4
- data/lib/chef/chef_fs/file_system/chef_server/acls_dir.rb +1 -1
- data/lib/chef/chef_fs/file_system/chef_server/cookbook_file.rb +1 -1
- data/lib/chef/chef_fs/file_system/chef_server/rest_list_entry.rb +6 -2
- data/lib/chef/chef_fs/file_system/repository/chef_repository_file_system_root_dir.rb +3 -3
- data/lib/chef/chef_fs/file_system/repository/directory.rb +1 -1
- data/lib/chef/chef_fs/parallelizer/parallel_enumerable.rb +1 -1
- data/lib/chef/chef_fs/path_utils.rb +3 -3
- data/lib/chef/client.rb +16 -14
- data/lib/chef/config.rb +1 -1
- data/lib/chef/cookbook/file_system_file_vendor.rb +1 -1
- data/lib/chef/cookbook/gem_installer.rb +1 -1
- data/lib/chef/cookbook/metadata.rb +45 -22
- data/lib/chef/cookbook_loader.rb +1 -1
- data/lib/chef/cookbook_manifest.rb +1 -1
- data/lib/chef/cookbook_site_streaming_uploader.rb +1 -1
- data/lib/chef/cookbook_version.rb +38 -3
- data/lib/chef/data_collector.rb +1 -1
- data/lib/chef/data_collector/error_handlers.rb +1 -1
- data/lib/chef/data_collector/run_end_message.rb +7 -1
- data/lib/chef/decorator/lazy_array.rb +2 -2
- data/lib/chef/deprecated.rb +4 -0
- data/lib/chef/digester.rb +4 -4
- data/lib/chef/dist.rb +8 -0
- data/lib/chef/dsl/chef_vault.rb +84 -0
- data/lib/chef/dsl/declare_resource.rb +7 -5
- data/lib/chef/dsl/platform_introspection.rb +3 -2
- data/lib/chef/dsl/recipe.rb +7 -12
- data/lib/chef/dsl/universal.rb +3 -7
- data/lib/chef/encrypted_data_bag_item/decryptor.rb +1 -1
- data/lib/chef/encrypted_data_bag_item/encryptor.rb +1 -1
- data/lib/chef/event_dispatch/base.rb +3 -0
- data/lib/chef/formatters/base.rb +1 -1
- data/lib/chef/formatters/doc.rb +1 -1
- data/lib/chef/formatters/indentable_output_stream.rb +7 -16
- data/lib/chef/http.rb +1 -1
- data/lib/chef/http/decompressor.rb +1 -1
- data/lib/chef/http/http_request.rb +3 -2
- data/lib/chef/json_compat.rb +1 -1
- data/lib/chef/key.rb +1 -1
- data/lib/chef/knife.rb +2 -4
- data/lib/chef/knife/acl_add.rb +57 -0
- data/lib/chef/knife/acl_base.rb +183 -0
- data/lib/chef/knife/acl_bulk_add.rb +78 -0
- data/lib/chef/knife/acl_bulk_remove.rb +83 -0
- data/lib/chef/knife/acl_remove.rb +62 -0
- data/lib/chef/knife/acl_show.rb +56 -0
- data/lib/chef/knife/bootstrap.rb +84 -90
- data/lib/chef/knife/bootstrap/chef_vault_handler.rb +2 -2
- data/lib/chef/knife/bootstrap/client_builder.rb +2 -2
- data/lib/chef/knife/bootstrap/templates/chef-full.erb +11 -11
- data/lib/chef/knife/bootstrap/templates/windows-chef-client-msi.erb +12 -12
- data/lib/chef/knife/core/bootstrap_context.rb +63 -60
- data/lib/chef/knife/core/generic_presenter.rb +4 -3
- data/lib/chef/knife/core/hashed_command_loader.rb +1 -1
- data/lib/chef/knife/core/node_presenter.rb +2 -2
- data/lib/chef/knife/core/status_presenter.rb +5 -5
- data/lib/chef/knife/core/subcommand_loader.rb +1 -1
- data/lib/chef/knife/core/ui.rb +17 -1
- data/lib/chef/knife/core/windows_bootstrap_context.rb +44 -42
- data/lib/chef/knife/data_bag_secret_options.rb +18 -45
- data/lib/chef/knife/group_add.rb +55 -0
- data/lib/chef/knife/{cookbook_site_download.rb → group_create.rb} +21 -12
- data/lib/chef/knife/group_destroy.rb +53 -0
- data/lib/chef/knife/{cookbook_site_list.rb → group_list.rb} +14 -11
- data/lib/chef/knife/group_remove.rb +56 -0
- data/lib/chef/knife/{cookbook_site_install.rb → group_show.rb} +21 -12
- data/lib/chef/knife/key_create_base.rb +1 -1
- data/lib/chef/knife/key_edit_base.rb +1 -1
- data/lib/chef/knife/ssh.rb +12 -31
- data/lib/chef/knife/status.rb +3 -3
- data/lib/chef/knife/supermarket_download.rb +1 -2
- data/lib/chef/knife/supermarket_install.rb +2 -3
- data/lib/chef/knife/supermarket_list.rb +1 -2
- data/lib/chef/knife/supermarket_search.rb +1 -2
- data/lib/chef/knife/supermarket_share.rb +1 -2
- data/lib/chef/knife/supermarket_show.rb +1 -2
- data/lib/chef/knife/supermarket_unshare.rb +1 -2
- data/lib/chef/knife/{cookbook_site_show.rb → user_dissociate.rb} +15 -13
- data/lib/chef/knife/{cookbook_site_search.rb → user_invite_add.rb} +16 -13
- data/lib/chef/knife/user_invite_list.rb +34 -0
- data/lib/chef/knife/user_invite_rescind.rb +63 -0
- data/lib/chef/knife/yaml_convert.rb +91 -0
- data/lib/chef/mixin/api_version_request_handling.rb +1 -1
- data/lib/chef/mixin/checksum.rb +0 -1
- data/lib/chef/mixin/openssl_helper.rb +4 -4
- data/lib/chef/mixin/powershell_exec.rb +10 -1
- data/lib/chef/mixin/powershell_out.rb +1 -1
- data/lib/chef/mixin/properties.rb +16 -2
- data/lib/chef/mixin/shell_out.rb +1 -5
- data/lib/chef/monkey_patches/net_http.rb +0 -4
- data/lib/chef/node.rb +18 -6
- data/lib/chef/node/attribute.rb +2 -2
- data/lib/chef/node/immutable_collections.rb +1 -1
- data/lib/chef/node/mixin/immutablize_array.rb +4 -0
- data/lib/chef/node/mixin/immutablize_hash.rb +3 -0
- data/lib/chef/node_map.rb +5 -31
- data/lib/chef/platform/priority_map.rb +4 -4
- data/lib/chef/platform/query_helpers.rb +6 -34
- data/lib/chef/policy_builder/policyfile.rb +1 -1
- data/lib/chef/powershell.rb +14 -0
- data/lib/chef/property.rb +24 -6
- data/lib/chef/provider.rb +40 -6
- data/lib/chef/provider/cron.rb +2 -2
- data/lib/chef/provider/directory.rb +3 -3
- data/lib/chef/provider/dsc_resource.rb +1 -1
- data/lib/chef/provider/dsc_script.rb +1 -1
- data/lib/chef/provider/execute.rb +3 -9
- data/lib/chef/provider/file.rb +6 -6
- data/lib/chef/provider/git.rb +84 -27
- data/lib/chef/provider/group.rb +4 -4
- data/lib/chef/provider/http_request.rb +6 -6
- data/lib/chef/provider/ifconfig.rb +4 -4
- data/lib/chef/provider/launchd.rb +45 -64
- data/lib/chef/provider/link.rb +2 -2
- data/lib/chef/provider/mount.rb +5 -5
- data/lib/chef/provider/osx_profile.rb +7 -3
- data/lib/chef/provider/package.rb +2 -2
- data/lib/chef/provider/package/cab.rb +5 -6
- data/lib/chef/provider/package/chocolatey.rb +1 -3
- data/lib/chef/provider/package/dnf.rb +66 -10
- data/lib/chef/provider/package/dnf/dnf_helper.py +85 -26
- data/lib/chef/provider/package/dnf/python_helper.rb +79 -36
- data/lib/chef/provider/package/dnf/version.rb +5 -1
- data/lib/chef/provider/package/dpkg.rb +1 -1
- data/lib/chef/provider/package/freebsd/base.rb +2 -1
- data/lib/chef/provider/package/homebrew.rb +107 -43
- data/lib/chef/provider/package/macports.rb +0 -2
- data/lib/chef/provider/package/msu.rb +4 -1
- data/lib/chef/provider/package/pacman.rb +25 -34
- data/lib/chef/provider/package/portage.rb +1 -0
- data/lib/chef/provider/package/powershell.rb +1 -1
- data/lib/chef/provider/package/rubygems.rb +30 -3
- data/lib/chef/provider/package/windows.rb +29 -53
- data/lib/chef/provider/package/windows/msi.rb +2 -2
- data/lib/chef/provider/package/yum.rb +1 -9
- data/lib/chef/provider/package/yum/yum_cache.rb +1 -1
- data/lib/chef/provider/package/zypper.rb +0 -1
- data/lib/chef/provider/powershell_script.rb +5 -11
- data/lib/chef/provider/registry_key.rb +4 -4
- data/lib/chef/provider/remote_directory.rb +5 -5
- data/lib/chef/provider/remote_file/ftp.rb +3 -2
- data/lib/chef/provider/remote_file/local_file.rb +2 -1
- data/lib/chef/provider/remote_file/sftp.rb +3 -2
- data/lib/chef/provider/route.rb +5 -3
- data/lib/chef/provider/ruby_block.rb +1 -1
- data/lib/chef/provider/script.rb +2 -2
- data/lib/chef/provider/service.rb +8 -8
- data/lib/chef/provider/service/aixinit.rb +1 -1
- data/lib/chef/provider/service/arch.rb +1 -1
- data/lib/chef/provider/service/debian.rb +30 -28
- data/lib/chef/provider/service/macosx.rb +16 -10
- data/lib/chef/provider/service/systemd.rb +12 -12
- data/lib/chef/provider/service/upstart.rb +1 -1
- data/lib/chef/provider/service/windows.rb +5 -11
- data/lib/chef/provider/subversion.rb +25 -5
- data/lib/chef/provider/systemd_unit.rb +26 -25
- data/lib/chef/provider/user.rb +6 -6
- data/lib/chef/provider/user/aix.rb +1 -1
- data/lib/chef/provider/user/dscl.rb +6 -6
- data/lib/chef/provider/user/mac.rb +20 -15
- data/lib/chef/provider/whyrun_safe_ruby_block.rb +1 -1
- data/lib/chef/provider/windows_env.rb +3 -3
- data/lib/chef/provider/windows_script.rb +2 -2
- data/lib/chef/provider/windows_task.rb +10 -10
- data/lib/chef/providers.rb +0 -6
- data/lib/chef/recipe.rb +36 -0
- data/lib/chef/resource.rb +44 -57
- data/lib/chef/resource/action_class.rb +24 -22
- data/lib/chef/resource/alternatives.rb +210 -0
- data/lib/chef/resource/apt_package.rb +33 -3
- data/lib/chef/resource/apt_preference.rb +103 -7
- data/lib/chef/resource/apt_repository.rb +357 -18
- data/lib/chef/resource/apt_update.rb +58 -5
- data/lib/chef/resource/archive_file.rb +6 -5
- data/lib/chef/resource/bash.rb +3 -1
- data/lib/chef/resource/batch.rb +1 -1
- data/lib/chef/resource/bff_package.rb +10 -2
- data/lib/chef/resource/breakpoint.rb +1 -2
- data/lib/chef/resource/build_essential.rb +49 -51
- data/lib/chef/resource/cab_package.rb +9 -2
- data/lib/chef/resource/chef_client_cron.rb +228 -0
- data/lib/chef/resource/chef_client_scheduled_task.rb +201 -0
- data/lib/chef/resource/chef_client_systemd_timer.rb +180 -0
- data/lib/chef/resource/chef_gem.rb +15 -18
- data/lib/chef/resource/chef_handler.rb +5 -4
- data/lib/chef/resource/chef_sleep.rb +7 -5
- data/lib/chef/resource/chef_vault_secret.rb +135 -0
- data/lib/chef/resource/chocolatey_config.rb +8 -4
- data/lib/chef/resource/chocolatey_feature.rb +7 -4
- data/lib/chef/resource/chocolatey_package.rb +7 -4
- data/lib/chef/resource/chocolatey_source.rb +7 -4
- data/lib/chef/resource/cookbook_file.rb +4 -3
- data/lib/chef/resource/cron.rb +34 -80
- data/lib/chef/resource/cron_access.rb +10 -6
- data/lib/chef/resource/cron_d.rb +44 -95
- data/lib/chef/resource/csh.rb +3 -1
- data/lib/chef/resource/directory.rb +3 -3
- data/lib/chef/resource/dmg_package.rb +22 -19
- data/lib/chef/resource/dnf_package.rb +3 -4
- data/lib/chef/resource/dpkg_package.rb +3 -2
- data/lib/chef/resource/dsc_resource.rb +6 -4
- data/lib/chef/resource/dsc_script.rb +3 -2
- data/lib/chef/resource/execute.rb +15 -14
- data/lib/chef/resource/file.rb +14 -9
- data/lib/chef/resource/freebsd_package.rb +3 -2
- data/lib/chef/resource/gem_package.rb +19 -11
- data/lib/chef/resource/group.rb +5 -2
- data/lib/chef/resource/helpers/cron_validations.rb +98 -0
- data/lib/chef/resource/homebrew_cask.rb +3 -2
- data/lib/chef/resource/homebrew_package.rb +5 -3
- data/lib/chef/resource/homebrew_tap.rb +3 -2
- data/lib/chef/resource/hostname.rb +26 -20
- data/lib/chef/resource/http_request.rb +1 -2
- data/lib/chef/resource/ifconfig.rb +8 -8
- data/lib/chef/resource/ips_package.rb +11 -3
- data/lib/chef/resource/kernel_module.rb +30 -30
- data/lib/chef/resource/ksh.rb +3 -1
- data/lib/chef/resource/launchd.rb +3 -3
- data/lib/chef/resource/link.rb +5 -27
- data/lib/chef/resource/locale.rb +60 -26
- data/lib/chef/resource/log.rb +13 -2
- data/lib/chef/resource/lwrp_base.rb +1 -1
- data/lib/chef/resource/macos_userdefaults.rb +18 -10
- data/lib/chef/resource/macosx_service.rb +3 -2
- data/lib/chef/resource/macports_package.rb +10 -2
- data/lib/chef/resource/mdadm.rb +63 -3
- data/lib/chef/resource/mount.rb +4 -1
- data/lib/chef/resource/msu_package.rb +19 -2
- data/lib/chef/resource/notify_group.rb +8 -3
- data/lib/chef/resource/ohai.rb +20 -4
- data/lib/chef/resource/ohai_hint.rb +4 -13
- data/lib/chef/resource/openbsd_package.rb +10 -2
- data/lib/chef/resource/openssl_dhparam.rb +11 -2
- data/lib/chef/resource/openssl_ec_private_key.rb +24 -2
- data/lib/chef/resource/openssl_ec_public_key.rb +22 -2
- data/lib/chef/resource/openssl_rsa_private_key.rb +21 -2
- data/lib/chef/resource/openssl_rsa_public_key.rb +23 -2
- data/lib/chef/resource/openssl_x509_certificate.rb +38 -2
- data/lib/chef/resource/openssl_x509_crl.rb +13 -2
- data/lib/chef/resource/openssl_x509_request.rb +38 -2
- data/lib/chef/resource/osx_profile.rb +4 -3
- data/lib/chef/resource/package.rb +3 -2
- data/lib/chef/resource/pacman_package.rb +3 -2
- data/lib/chef/resource/paludis_package.rb +13 -4
- data/lib/chef/resource/perl.rb +3 -1
- data/lib/chef/resource/plist.rb +207 -0
- data/lib/chef/resource/portage_package.rb +14 -4
- data/lib/chef/resource/powershell_package.rb +2 -4
- data/lib/chef/resource/powershell_package_source.rb +4 -2
- data/lib/chef/resource/powershell_script.rb +8 -18
- data/lib/chef/resource/python.rb +3 -1
- data/lib/chef/resource/reboot.rb +1 -2
- data/lib/chef/resource/registry_key.rb +2 -3
- data/lib/chef/resource/remote_directory.rb +3 -1
- data/lib/chef/resource/remote_file.rb +3 -2
- data/lib/chef/resource/rhsm_errata.rb +1 -4
- data/lib/chef/resource/rhsm_errata_level.rb +1 -2
- data/lib/chef/resource/rhsm_register.rb +3 -3
- data/lib/chef/resource/rhsm_repo.rb +4 -3
- data/lib/chef/resource/rhsm_subscription.rb +5 -4
- data/lib/chef/resource/route.rb +6 -2
- data/lib/chef/resource/rpm_package.rb +13 -3
- data/lib/chef/resource/ruby.rb +3 -1
- data/lib/chef/resource/ruby_block.rb +2 -5
- data/lib/chef/resource/scm/_scm.rb +49 -0
- data/lib/chef/resource/{scm.rb → scm/git.rb} +16 -30
- data/lib/chef/resource/{subversion.rb → scm/subversion.rb} +10 -7
- data/lib/chef/resource/script.rb +7 -4
- data/lib/chef/resource/service.rb +7 -8
- data/lib/chef/resource/smartos_package.rb +10 -2
- data/lib/chef/resource/snap_package.rb +4 -2
- data/lib/chef/resource/solaris_package.rb +10 -2
- data/lib/chef/resource/ssh_known_hosts_entry.rb +6 -3
- data/lib/chef/resource/sudo.rb +11 -11
- 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 -2
- data/lib/chef/resource/support/ulimit.erb +41 -0
- data/lib/chef/resource/swap_file.rb +7 -5
- data/lib/chef/resource/sysctl.rb +63 -4
- data/lib/chef/resource/systemd_unit.rb +6 -4
- data/lib/chef/resource/template.rb +0 -1
- data/lib/chef/resource/timezone.rb +8 -19
- data/lib/chef/resource/user.rb +3 -5
- data/lib/chef/resource/user/aix_user.rb +0 -2
- data/lib/chef/resource/user/dscl_user.rb +1 -1
- data/lib/chef/resource/user/linux_user.rb +0 -2
- data/lib/chef/resource/user/mac_user.rb +1 -1
- data/lib/chef/resource/user/pw_user.rb +0 -2
- data/lib/chef/resource/user/solaris_user.rb +0 -2
- data/lib/chef/resource/user/windows_user.rb +0 -2
- data/lib/chef/resource/user_ulimit.rb +116 -0
- data/lib/chef/resource/whyrun_safe_ruby_block.rb +1 -0
- data/lib/chef/resource/windows_ad_join.rb +20 -7
- data/lib/chef/resource/windows_auto_run.rb +2 -3
- data/lib/chef/resource/windows_certificate.rb +3 -3
- data/lib/chef/resource/windows_dfs_folder.rb +1 -2
- data/lib/chef/resource/windows_dfs_namespace.rb +1 -2
- data/lib/chef/resource/windows_dfs_server.rb +2 -3
- data/lib/chef/resource/windows_dns_record.rb +0 -1
- data/lib/chef/resource/windows_dns_zone.rb +0 -1
- data/lib/chef/resource/windows_env.rb +12 -4
- data/lib/chef/resource/windows_feature.rb +59 -4
- data/lib/chef/resource/windows_feature_dism.rb +24 -24
- data/lib/chef/resource/windows_feature_powershell.rb +44 -78
- data/lib/chef/resource/windows_firewall_rule.rb +121 -8
- data/lib/chef/resource/windows_font.rb +10 -2
- data/lib/chef/resource/windows_package.rb +76 -7
- data/lib/chef/resource/windows_pagefile.rb +31 -4
- data/lib/chef/resource/windows_path.rb +18 -2
- data/lib/chef/resource/windows_printer.rb +26 -7
- data/lib/chef/resource/windows_printer_port.rb +29 -2
- data/lib/chef/resource/windows_script.rb +3 -4
- data/lib/chef/resource/windows_security_policy.rb +119 -0
- data/lib/chef/resource/windows_service.rb +46 -32
- data/lib/chef/resource/windows_share.rb +22 -6
- data/lib/chef/resource/windows_shortcut.rb +13 -3
- data/lib/chef/resource/windows_task.rb +129 -16
- data/lib/chef/resource/windows_uac.rb +20 -2
- data/lib/chef/resource/windows_user_privilege.rb +199 -0
- data/lib/chef/resource/windows_workgroup.rb +19 -4
- data/lib/chef/resource/yum_package.rb +91 -7
- data/lib/chef/resource/yum_repository.rb +30 -12
- data/lib/chef/resource/zypper_package.rb +32 -5
- data/lib/chef/resource/zypper_repository.rb +19 -6
- data/lib/chef/resource_builder.rb +8 -0
- data/lib/chef/resource_inspector.rb +3 -2
- data/lib/chef/resource_resolver.rb +7 -14
- data/lib/chef/resources.rb +11 -3
- data/lib/chef/run_context/cookbook_compiler.rb +29 -5
- data/lib/chef/scan_access_control.rb +1 -1
- data/lib/chef/shell.rb +22 -0
- data/lib/chef/shell/ext.rb +1 -1
- data/lib/chef/version.rb +1 -1
- data/lib/chef/win32/api.rb +2 -2
- data/lib/chef/win32/api/error.rb +3 -1
- data/lib/chef/win32/api/file.rb +1 -1
- data/lib/chef/win32/api/net.rb +1 -0
- data/lib/chef/win32/api/security.rb +6 -0
- data/lib/chef/win32/file.rb +1 -9
- data/lib/chef/win32/mutex.rb +1 -1
- data/lib/chef/win32/net.rb +1 -0
- data/lib/chef/win32/security.rb +40 -2
- data/lib/chef/win32/security/sid.rb +4 -4
- data/spec/functional/assets/inittest +8 -7
- data/spec/functional/knife/ssh_spec.rb +23 -19
- data/spec/functional/resource/cron_spec.rb +10 -29
- data/spec/functional/resource/dnf_package_spec.rb +441 -156
- data/spec/functional/resource/git_spec.rb +184 -134
- data/spec/functional/resource/insserv_spec.rb +1 -1
- data/spec/functional/resource/launchd_spec.rb +232 -0
- data/spec/functional/resource/link_spec.rb +3 -3
- data/spec/functional/resource/locale_spec.rb +13 -2
- data/spec/functional/resource/msu_package_spec.rb +5 -2
- data/spec/functional/resource/powershell_script_spec.rb +7 -68
- data/spec/functional/resource/remote_file_spec.rb +1 -1
- data/spec/functional/resource/windows_security_policy_spec.rb +90 -0
- data/spec/functional/resource/windows_task_spec.rb +4 -4
- data/spec/functional/resource/windows_user_privilege_spec.rb +193 -0
- data/spec/functional/run_lock_spec.rb +1 -1
- data/spec/functional/shell_spec.rb +1 -1
- data/spec/functional/util/powershell/cmdlet_spec.rb +1 -1
- data/spec/functional/version_spec.rb +1 -1
- data/spec/functional/win32/registry_spec.rb +0 -6
- data/spec/functional/win32/security_spec.rb +22 -0
- data/spec/integration/client/client_spec.rb +123 -2
- data/spec/integration/knife/cookbook_show_spec.rb +28 -26
- data/spec/integration/knife/data_bag_show_spec.rb +1 -1
- data/spec/integration/knife/raw_spec.rb +34 -6
- data/spec/integration/knife/redirection_spec.rb +2 -2
- data/spec/integration/knife/show_spec.rb +32 -3
- data/spec/integration/recipes/lwrp_inline_resources_spec.rb +3 -3
- data/spec/integration/recipes/noop_resource_spec.rb +1 -1
- data/spec/integration/recipes/notifies_spec.rb +49 -20
- data/spec/integration/recipes/notifying_block_spec.rb +8 -5
- data/spec/integration/recipes/provider_choice.rb +2 -0
- data/spec/integration/recipes/recipe_dsl_spec.rb +45 -143
- data/spec/integration/recipes/resource_action_spec.rb +16 -11
- data/spec/integration/recipes/resource_converge_if_changed_spec.rb +1 -1
- data/spec/integration/recipes/resource_load_spec.rb +133 -12
- data/spec/integration/recipes/use_partial_spec.rb +112 -0
- data/spec/integration/solo/solo_spec.rb +3 -3
- data/spec/spec_helper.rb +18 -3
- data/spec/support/chef_helpers.rb +2 -2
- data/spec/support/lib/chef/resource/zen_follower.rb +2 -0
- data/spec/support/platform_helpers.rb +2 -20
- data/spec/support/recipe_dsl_helper.rb +83 -0
- data/spec/support/shared/functional/http.rb +2 -2
- data/spec/support/shared/functional/windows_script.rb +3 -16
- data/spec/support/shared/integration/knife_support.rb +9 -6
- data/spec/support/shared/unit/mock_shellout.rb +1 -1
- data/spec/support/shared/unit/provider/useradd_based_user_provider.rb +4 -4
- data/spec/unit/application/apply_spec.rb +3 -0
- data/spec/unit/application/client_spec.rb +5 -1
- data/spec/unit/application_spec.rb +1 -2
- data/spec/unit/client_spec.rb +7 -5
- data/spec/unit/cookbook/gem_installer_spec.rb +2 -2
- data/spec/unit/cookbook/metadata_spec.rb +38 -19
- data/spec/unit/data_collector_spec.rb +39 -18
- data/spec/unit/file_access_control_spec.rb +1 -1
- data/spec/unit/json_compat_spec.rb +1 -1
- data/spec/unit/knife/bootstrap/chef_vault_handler_spec.rb +15 -15
- data/spec/unit/knife/bootstrap/client_builder_spec.rb +9 -9
- data/spec/unit/knife/bootstrap_spec.rb +20 -38
- data/spec/unit/knife/cookbook_show_spec.rb +1 -0
- data/spec/unit/knife/core/bootstrap_context_spec.rb +23 -43
- data/spec/unit/knife/core/ui_spec.rb +16 -0
- data/spec/unit/knife/core/windows_bootstrap_context_spec.rb +9 -63
- data/spec/unit/knife/data_bag_secret_options_spec.rb +22 -14
- data/spec/unit/knife/ssh_spec.rb +8 -111
- data/spec/unit/knife/status_spec.rb +1 -1
- data/spec/unit/knife_spec.rb +18 -0
- data/spec/unit/mixin/openssl_helper_spec.rb +4 -4
- data/spec/unit/mixin/powershell_exec_spec.rb +10 -0
- data/spec/unit/mixin/shell_out_spec.rb +25 -31
- data/spec/unit/node/attribute_spec.rb +3 -3
- data/spec/unit/node_spec.rb +24 -0
- data/spec/unit/platform/query_helpers_spec.rb +0 -143
- data/spec/unit/property/state_spec.rb +12 -7
- data/spec/unit/property/validation_spec.rb +25 -1
- data/spec/unit/property_spec.rb +12 -9
- data/spec/unit/provider/apt_preference_spec.rb +14 -10
- data/spec/unit/provider/apt_repository_spec.rb +34 -36
- data/spec/unit/provider/apt_update_spec.rb +12 -11
- data/spec/unit/provider/cookbook_file_spec.rb +4 -4
- data/spec/unit/provider/cron_spec.rb +2 -2
- data/spec/unit/provider/directory_spec.rb +4 -15
- data/spec/unit/provider/file_spec.rb +4 -4
- data/spec/unit/provider/git_spec.rb +41 -1
- data/spec/unit/provider/group/groupadd_spec.rb +1 -1
- data/spec/unit/provider/launchd_spec.rb +8 -50
- data/spec/unit/provider/link_spec.rb +0 -1
- data/spec/unit/provider/log_spec.rb +3 -3
- data/spec/unit/provider/mdadm_spec.rb +3 -3
- data/spec/unit/provider/package/dnf/python_helper_spec.rb +1 -1
- data/spec/unit/provider/package/homebrew_spec.rb +280 -174
- data/spec/unit/provider/package/pacman_spec.rb +65 -147
- data/spec/unit/provider/package/portage_spec.rb +2 -2
- data/spec/unit/provider/package/powershell_spec.rb +3 -2
- data/spec/unit/provider/package/rubygems_spec.rb +211 -26
- data/spec/unit/provider/package/windows/exe_spec.rb +1 -1
- data/spec/unit/provider/powershell_script_spec.rb +21 -61
- data/spec/unit/provider/remote_file_spec.rb +3 -4
- data/spec/unit/provider/service/debian_service_spec.rb +34 -13
- data/spec/unit/provider/service/macosx_spec.rb +210 -214
- data/spec/unit/provider/service/systemd_service_spec.rb +23 -23
- data/spec/unit/provider/subversion_spec.rb +4 -2
- data/spec/unit/provider/template_spec.rb +3 -4
- data/spec/unit/provider/zypper_repository_spec.rb +17 -17
- data/spec/unit/provider_resolver_spec.rb +4 -4
- data/spec/unit/recipe_spec.rb +68 -0
- data/spec/unit/resource/alternatives_spec.rb +120 -0
- data/spec/unit/resource/apt_preference_spec.rb +0 -18
- data/spec/unit/resource/apt_repository_spec.rb +0 -18
- data/spec/unit/resource/apt_update_spec.rb +0 -18
- data/spec/unit/resource/chef_client_cron_spec.rb +119 -0
- data/spec/unit/resource/chef_client_scheduled_task_spec.rb +102 -0
- data/spec/unit/resource/chef_client_systemd_timer_spec.rb +70 -0
- data/spec/unit/resource/chef_vault_secret_spec.rb +40 -0
- data/spec/unit/resource/chocolatey_source_spec.rb +2 -1
- data/spec/unit/resource/cron_d_spec.rb +6 -48
- data/spec/unit/resource/cron_spec.rb +4 -10
- data/spec/unit/resource/gem_package_spec.rb +3 -3
- data/spec/unit/resource/helpers/cron_validations_spec.rb +77 -0
- data/spec/unit/resource/link_spec.rb +0 -4
- data/spec/unit/resource/locale_spec.rb +0 -34
- data/spec/unit/resource/msu_package_spec.rb +4 -0
- data/spec/unit/resource/ohai_spec.rb +56 -2
- data/spec/unit/resource/plist_spec.rb +130 -0
- data/spec/unit/resource/powershell_script_spec.rb +0 -5
- data/spec/unit/resource/{git_spec.rb → scm/git_spec.rb} +50 -2
- data/spec/unit/resource/{scm_spec.rb → scm/scm.rb} +1 -52
- data/spec/unit/resource/{subversion_spec.rb → scm/subversion_spec.rb} +2 -3
- data/spec/unit/resource/service_spec.rb +4 -0
- data/spec/unit/resource/user_spec.rb +2 -2
- data/spec/unit/resource/user_ulimit_spec.rb +53 -0
- data/spec/unit/resource/windows_feature_dism_spec.rb +2 -17
- data/spec/unit/resource/windows_feature_powershell_spec.rb +2 -17
- data/spec/unit/resource/windows_firewall_rule_spec.rb +88 -41
- data/spec/unit/resource/windows_package_spec.rb +14 -0
- data/spec/unit/resource/windows_service_spec.rb +9 -0
- data/spec/unit/resource_reporter_spec.rb +2 -6
- data/spec/unit/resource_spec.rb +10 -3
- data/spec/unit/run_lock_spec.rb +1 -1
- data/spec/unit/scan_access_control_spec.rb +1 -1
- data/spec/unit/search/query_spec.rb +1 -1
- data/spec/unit/win32/registry_spec.rb +1 -1
- data/tasks/rspec.rb +6 -14
- metadata +92 -37
- data/lib/chef/dsl/core.rb +0 -52
- data/lib/chef/knife/cookbook_site_share.rb +0 -41
- data/lib/chef/knife/cookbook_site_unshare.rb +0 -41
- data/lib/chef/provider/apt_preference.rb +0 -93
- data/lib/chef/provider/apt_repository.rb +0 -358
- data/lib/chef/provider/apt_update.rb +0 -79
- data/lib/chef/provider/log.rb +0 -43
- data/lib/chef/provider/mdadm.rb +0 -85
- data/lib/chef/provider/ohai.rb +0 -45
- data/lib/chef/resource/git.rb +0 -37
- data/spec/unit/provider/ohai_spec.rb +0 -84
@@ -177,13 +177,13 @@ describe Chef::Provider::Service::Systemd do
|
|
177
177
|
|
178
178
|
context "when a user is not specified" do
|
179
179
|
it "should call '#{systemctl_path} --system start service_name' if no start command is specified" do
|
180
|
-
expect(provider).to receive(:
|
180
|
+
expect(provider).to receive(:shell_out_compacted!).with(systemctl_path, "--system", "start", service_name, default_env: false, timeout: 900).and_return(shell_out_success)
|
181
181
|
provider.start_service
|
182
182
|
end
|
183
183
|
|
184
184
|
it "should not call '#{systemctl_path} --system start service_name' if it is already running" do
|
185
185
|
current_resource.running(true)
|
186
|
-
expect(provider).not_to receive(:
|
186
|
+
expect(provider).not_to receive(:shell_out_compacted!).with(systemctl_path, "--system", "start", service_name, timeout: 900)
|
187
187
|
provider.start_service
|
188
188
|
end
|
189
189
|
end
|
@@ -191,14 +191,14 @@ describe Chef::Provider::Service::Systemd do
|
|
191
191
|
context "when a user is specified" do
|
192
192
|
it "should call '#{systemctl_path} --user start service_name' if no start command is specified" do
|
193
193
|
current_resource.user("joe")
|
194
|
-
expect(provider).to receive(:
|
194
|
+
expect(provider).to receive(:shell_out_compacted!).with(systemctl_path, "--user", "start", service_name, environment: { "DBUS_SESSION_BUS_ADDRESS" => "unix:path=/run/user/10000/bus" }, user: "joe", default_env: false, timeout: 900).and_return(shell_out_success)
|
195
195
|
provider.start_service
|
196
196
|
end
|
197
197
|
|
198
198
|
it "should not call '#{systemctl_path} --user start service_name' if it is already running" do
|
199
199
|
current_resource.running(true)
|
200
200
|
current_resource.user("joe")
|
201
|
-
expect(provider).not_to receive(:
|
201
|
+
expect(provider).not_to receive(:shell_out_compacted!).with(systemctl_path, "--user", "start", service_name, environment: { "DBUS_SESSION_BUS_ADDRESS" => "unix:path=/run/user/10000/bus" }, user: "joe", timeout: 900)
|
202
202
|
provider.start_service
|
203
203
|
end
|
204
204
|
end
|
@@ -212,7 +212,7 @@ describe Chef::Provider::Service::Systemd do
|
|
212
212
|
|
213
213
|
it "should call '#{systemctl_path} --system restart service_name' if no restart command is specified" do
|
214
214
|
current_resource.running(true)
|
215
|
-
expect(provider).to receive(:
|
215
|
+
expect(provider).to receive(:shell_out_compacted!).with(systemctl_path, "--system", "restart", service_name, default_env: false, timeout: 900).and_return(shell_out_success)
|
216
216
|
provider.restart_service
|
217
217
|
end
|
218
218
|
|
@@ -229,7 +229,7 @@ describe Chef::Provider::Service::Systemd do
|
|
229
229
|
context "when a reload command is not specified" do
|
230
230
|
it "should call '#{systemctl_path} --system reload service_name' if the service is running" do
|
231
231
|
current_resource.running(true)
|
232
|
-
expect(provider).to receive(:
|
232
|
+
expect(provider).to receive(:shell_out_compacted!).with(systemctl_path, "--system", "reload", service_name, default_env: false, timeout: 900).and_return(shell_out_success)
|
233
233
|
provider.reload_service
|
234
234
|
end
|
235
235
|
|
@@ -250,13 +250,13 @@ describe Chef::Provider::Service::Systemd do
|
|
250
250
|
|
251
251
|
it "should call '#{systemctl_path} --system stop service_name' if no stop command is specified" do
|
252
252
|
current_resource.running(true)
|
253
|
-
expect(provider).to receive(:
|
253
|
+
expect(provider).to receive(:shell_out_compacted!).with(systemctl_path, "--system", "stop", service_name, timeout: 900, default_env: false).and_return(shell_out_success)
|
254
254
|
provider.stop_service
|
255
255
|
end
|
256
256
|
|
257
257
|
it "should not call '#{systemctl_path} --system stop service_name' if it is already stopped" do
|
258
258
|
current_resource.running(false)
|
259
|
-
expect(provider).not_to receive(:
|
259
|
+
expect(provider).not_to receive(:shell_out_compacted!).with(systemctl_path, "--system", "stop", service_name, timeout: 900)
|
260
260
|
provider.stop_service
|
261
261
|
end
|
262
262
|
end
|
@@ -269,12 +269,12 @@ describe Chef::Provider::Service::Systemd do
|
|
269
269
|
end
|
270
270
|
|
271
271
|
it "should call '#{systemctl_path} --system enable service_name' to enable the service" do
|
272
|
-
expect(provider).to receive(:
|
272
|
+
expect(provider).to receive(:shell_out_compacted!).with(systemctl_path, "--system", "enable", service_name, timeout: 900).and_return(shell_out_success)
|
273
273
|
provider.enable_service
|
274
274
|
end
|
275
275
|
|
276
276
|
it "should call '#{systemctl_path} --system disable service_name' to disable the service" do
|
277
|
-
expect(provider).to receive(:
|
277
|
+
expect(provider).to receive(:shell_out_compacted!).with(systemctl_path, "--system", "disable", service_name, timeout: 900).and_return(shell_out_success)
|
278
278
|
provider.disable_service
|
279
279
|
end
|
280
280
|
end
|
@@ -287,12 +287,12 @@ describe Chef::Provider::Service::Systemd do
|
|
287
287
|
end
|
288
288
|
|
289
289
|
it "should call '#{systemctl_path} --system mask service_name' to mask the service" do
|
290
|
-
expect(provider).to receive(:
|
290
|
+
expect(provider).to receive(:shell_out_compacted!).with(systemctl_path, "--system", "mask", service_name, timeout: 900).and_return(shell_out_success)
|
291
291
|
provider.mask_service
|
292
292
|
end
|
293
293
|
|
294
294
|
it "should call '#{systemctl_path} --system unmask service_name' to unmask the service" do
|
295
|
-
expect(provider).to receive(:
|
295
|
+
expect(provider).to receive(:shell_out_compacted!).with(systemctl_path, "--system", "unmask", service_name, timeout: 900).and_return(shell_out_success)
|
296
296
|
provider.unmask_service
|
297
297
|
end
|
298
298
|
end
|
@@ -305,12 +305,12 @@ describe Chef::Provider::Service::Systemd do
|
|
305
305
|
end
|
306
306
|
|
307
307
|
it "should return true if '#{systemctl_path} --system is-active service_name' returns 0" do
|
308
|
-
expect(provider).to receive(:
|
308
|
+
expect(provider).to receive(:shell_out_compacted).with(systemctl_path, "--system", "is-active", service_name, "--quiet", timeout: 900).and_return(shell_out_success)
|
309
309
|
expect(provider.is_active?).to be true
|
310
310
|
end
|
311
311
|
|
312
312
|
it "should return false if '#{systemctl_path} --system is-active service_name' returns anything except 0" do
|
313
|
-
expect(provider).to receive(:
|
313
|
+
expect(provider).to receive(:shell_out_compacted).with(systemctl_path, "--system", "is-active", service_name, "--quiet", timeout: 900).and_return(shell_out_failure)
|
314
314
|
expect(provider.is_active?).to be false
|
315
315
|
end
|
316
316
|
end
|
@@ -323,12 +323,12 @@ describe Chef::Provider::Service::Systemd do
|
|
323
323
|
end
|
324
324
|
|
325
325
|
it "should return true if '#{systemctl_path} --system is-enabled service_name' returns 0" do
|
326
|
-
expect(provider).to receive(:
|
326
|
+
expect(provider).to receive(:shell_out_compacted).with(systemctl_path, "--system", "is-enabled", service_name, "--quiet", timeout: 900).and_return(shell_out_success)
|
327
327
|
expect(provider.is_enabled?).to be true
|
328
328
|
end
|
329
329
|
|
330
330
|
it "should return false if '#{systemctl_path} --system is-enabled service_name' returns anything except 0" do
|
331
|
-
expect(provider).to receive(:
|
331
|
+
expect(provider).to receive(:shell_out_compacted).with(systemctl_path, "--system", "is-enabled", service_name, "--quiet", timeout: 900).and_return(shell_out_failure)
|
332
332
|
expect(provider.is_enabled?).to be false
|
333
333
|
end
|
334
334
|
end
|
@@ -341,22 +341,22 @@ describe Chef::Provider::Service::Systemd do
|
|
341
341
|
end
|
342
342
|
|
343
343
|
it "should return true if '#{systemctl_path} --system is-enabled service_name' returns 'masked' and returns anything except 0" do
|
344
|
-
expect(provider).to receive(:
|
344
|
+
expect(provider).to receive(:shell_out_compacted).with(systemctl_path, "--system", "is-enabled", service_name, timeout: 900).and_return(double(stdout: "masked", exitstatus: shell_out_failure))
|
345
345
|
expect(provider.is_masked?).to be true
|
346
346
|
end
|
347
347
|
|
348
348
|
it "should return true if '#{systemctl_path} --system is-enabled service_name' outputs 'masked-runtime' and returns anything except 0" do
|
349
|
-
expect(provider).to receive(:
|
349
|
+
expect(provider).to receive(:shell_out_compacted).with(systemctl_path, "--system", "is-enabled", service_name, timeout: 900).and_return(double(stdout: "masked-runtime", exitstatus: shell_out_failure))
|
350
350
|
expect(provider.is_masked?).to be true
|
351
351
|
end
|
352
352
|
|
353
353
|
it "should return false if '#{systemctl_path} --system is-enabled service_name' returns 0" do
|
354
|
-
expect(provider).to receive(:
|
354
|
+
expect(provider).to receive(:shell_out_compacted).with(systemctl_path, "--system", "is-enabled", service_name, timeout: 900).and_return(double(stdout: "enabled", exitstatus: shell_out_success))
|
355
355
|
expect(provider.is_masked?).to be false
|
356
356
|
end
|
357
357
|
|
358
358
|
it "should return false if '#{systemctl_path} --system is-enabled service_name' returns anything except 0 and outputs an error'" do
|
359
|
-
expect(provider).to receive(:
|
359
|
+
expect(provider).to receive(:shell_out_compacted).with(systemctl_path, "--system", "is-enabled", service_name, timeout: 900).and_return(double(stdout: "Failed to get unit file state for #{service_name}: No such file or directory", exitstatus: shell_out_failure))
|
360
360
|
expect(provider.is_masked?).to be false
|
361
361
|
end
|
362
362
|
end
|
@@ -369,17 +369,17 @@ describe Chef::Provider::Service::Systemd do
|
|
369
369
|
end
|
370
370
|
|
371
371
|
it "should return true if '#{systemctl_path} --system is-enabled service_name' returns 'indirect'" do
|
372
|
-
expect(provider).to receive(:
|
372
|
+
expect(provider).to receive(:shell_out_compacted).with(systemctl_path, "--system", "is-enabled", service_name, timeout: 900).and_return(double(stdout: "indirect", exitstatus: shell_out_success))
|
373
373
|
expect(provider.is_indirect?).to be true
|
374
374
|
end
|
375
375
|
|
376
376
|
it "should return false if '#{systemctl_path} --system is-enabled service_name' returns 0 and outputs something other than 'indirect'" do
|
377
|
-
expect(provider).to receive(:
|
377
|
+
expect(provider).to receive(:shell_out_compacted).with(systemctl_path, "--system", "is-enabled", service_name, timeout: 900).and_return(double(stdout: "enabled", exitstatus: shell_out_success))
|
378
378
|
expect(provider.is_indirect?).to be false
|
379
379
|
end
|
380
380
|
|
381
381
|
it "should return false if '#{systemctl_path} --system is-enabled service_name' returns anything except 0 and outputs somethign other than 'indirect''" do
|
382
|
-
expect(provider).to receive(:
|
382
|
+
expect(provider).to receive(:shell_out_compacted).with(systemctl_path, "--system", "is-enabled", service_name, timeout: 900).and_return(double(stdout: "enabled", exitstatus: shell_out_failure))
|
383
383
|
expect(provider.is_indirect?).to be false
|
384
384
|
end
|
385
385
|
end
|
@@ -46,7 +46,8 @@ describe Chef::Provider::Subversion do
|
|
46
46
|
it "converts resource properties to options for shell_out" do
|
47
47
|
expect(@provider.run_options).to eq({})
|
48
48
|
@resource.user "deployninja"
|
49
|
-
expect(@provider
|
49
|
+
expect(@provider).to receive(:get_homedir).and_return("/home/deployninja")
|
50
|
+
expect(@provider.run_options).to eq({ user: "deployninja", environment: { "HOME" => "/home/deployninja" } })
|
50
51
|
end
|
51
52
|
|
52
53
|
context "determining the revision of the currently deployed code" do
|
@@ -221,7 +222,8 @@ describe Chef::Provider::Subversion do
|
|
221
222
|
@resource.user "whois"
|
222
223
|
@resource.group "thisis"
|
223
224
|
expected_cmd = "svn checkout -q -r12345 http://svn.example.org/trunk/ /my/deploy/dir"
|
224
|
-
expect(@provider).to receive(:
|
225
|
+
expect(@provider).to receive(:get_homedir).and_return("/home/whois")
|
226
|
+
expect(@provider).to receive(:shell_out!).with(expected_cmd, { user: "whois", group: "thisis", environment: { "HOME" => "/home/whois" } })
|
225
227
|
@provider.run_action(:checkout)
|
226
228
|
expect(@resource).to be_updated
|
227
229
|
end
|
@@ -24,10 +24,9 @@ require "ostruct"
|
|
24
24
|
require "support/shared/unit/provider/file"
|
25
25
|
|
26
26
|
describe Chef::Provider::Template do
|
27
|
-
let(:node) {
|
28
|
-
let(:events) {
|
29
|
-
let(:
|
30
|
-
let(:run_context) { double("Chef::RunContext", node: node, events: events, logger: logger) }
|
27
|
+
let(:node) { Chef::Node.new }
|
28
|
+
let(:events) { Chef::EventDispatch::Dispatcher.new }
|
29
|
+
let(:run_context) { Chef::RunContext.new(node, {}, events) }
|
31
30
|
let(:enclosing_directory) do
|
32
31
|
canonicalize_path(File.expand_path(File.join(CHEF_SPEC_DATA, "templates")))
|
33
32
|
end
|
@@ -18,22 +18,22 @@
|
|
18
18
|
|
19
19
|
require "spec_helper"
|
20
20
|
|
21
|
-
# Output of the command:
|
22
|
-
# => rpm -qa gpg-pubkey*
|
23
|
-
RPM_KEYS = <<~EOF.freeze
|
24
|
-
gpg-pubkey-307e3d54-4be01a65
|
25
|
-
gpg-pubkey-3dbdc284-53674dd4
|
26
|
-
EOF
|
27
|
-
|
28
|
-
# Output of the command:
|
29
|
-
# => gpg --with-fingerprint [FILE]
|
30
|
-
GPG_FINGER = <<~EOF.freeze
|
31
|
-
pub 2048R/3DBDC284 2011-08-19 [expires: 2024-06-14]
|
32
|
-
Key fingerprint = 573B FD6B 3D8F BC64 1079 A6AB ABF5 BD82 7BD9 BF62
|
33
|
-
uid nginx signing key <signing-key@nginx.com>
|
34
|
-
EOF
|
35
|
-
|
36
21
|
describe Chef::Provider::ZypperRepository do
|
22
|
+
# Output of the command:
|
23
|
+
# => rpm -qa gpg-pubkey*
|
24
|
+
ZYPPER_RPM_KEYS = <<~EOF.freeze
|
25
|
+
gpg-pubkey-307e3d54-4be01a65
|
26
|
+
gpg-pubkey-3dbdc284-53674dd4
|
27
|
+
EOF
|
28
|
+
|
29
|
+
# Output of the command:
|
30
|
+
# => gpg --with-fingerprint [FILE]
|
31
|
+
ZYPPER_GPG_FINGER = <<~EOF.freeze
|
32
|
+
pub 2048R/3DBDC284 2011-08-19 [expires: 2024-06-14]
|
33
|
+
Key fingerprint = 573B FD6B 3D8F BC64 1079 A6AB ABF5 BD82 7BD9 BF62
|
34
|
+
uid nginx signing key <signing-key@nginx.com>
|
35
|
+
EOF
|
36
|
+
|
37
37
|
let(:new_resource) { Chef::Resource::ZypperRepository.new("Nginx Repository") }
|
38
38
|
let(:logger) { double("Mixlib::Log::Child").as_null_object }
|
39
39
|
let(:provider) do
|
@@ -45,11 +45,11 @@ describe Chef::Provider::ZypperRepository do
|
|
45
45
|
end
|
46
46
|
|
47
47
|
let(:rpm_key_finger) do
|
48
|
-
double("shell_out", stdout:
|
48
|
+
double("shell_out", stdout: ZYPPER_RPM_KEYS, exitstatus: 0, error?: false)
|
49
49
|
end
|
50
50
|
|
51
51
|
let(:gpg_finger) do
|
52
|
-
double("shell_out", stdout:
|
52
|
+
double("shell_out", stdout: ZYPPER_GPG_FINGER, exitstatus: 0, error?: false)
|
53
53
|
end
|
54
54
|
|
55
55
|
it "responds to load_current_resource" do
|
@@ -560,9 +560,9 @@ describe Chef::ProviderResolver do
|
|
560
560
|
ips_package: [ Chef::Resource::IpsPackage, Chef::Provider::Package::Ips ],
|
561
561
|
link: [ Chef::Resource::Link, Chef::Provider::Link ],
|
562
562
|
linux_user: [ Chef::Resource::User::LinuxUser, Chef::Provider::User::Linux ],
|
563
|
-
log: [ Chef::Resource::Log
|
563
|
+
log: [ Chef::Resource::Log ],
|
564
564
|
macports_package: [ Chef::Resource::MacportsPackage, Chef::Provider::Package::Macports ],
|
565
|
-
mdadm: [ Chef::Resource::Mdadm
|
565
|
+
mdadm: [ Chef::Resource::Mdadm ],
|
566
566
|
mount: [ Chef::Resource::Mount, Chef::Provider::Mount::Mount ],
|
567
567
|
pacman_package: [ Chef::Resource::PacmanPackage, Chef::Provider::Package::Pacman ],
|
568
568
|
paludis_package: [ Chef::Resource::PaludisPackage, Chef::Provider::Package::Paludis ],
|
@@ -874,8 +874,8 @@ describe Chef::ProviderResolver do
|
|
874
874
|
end
|
875
875
|
# If there is no filter, we're as deep as we need to go
|
876
876
|
unless filter
|
877
|
-
on_platform test.delete(:platform), test do
|
878
|
-
expect_providers(expected)
|
877
|
+
on_platform test.delete(:platform), **test do
|
878
|
+
expect_providers(**expected)
|
879
879
|
end
|
880
880
|
end
|
881
881
|
end
|
data/spec/unit/recipe_spec.rb
CHANGED
@@ -576,6 +576,74 @@ describe Chef::Recipe do
|
|
576
576
|
end
|
577
577
|
end
|
578
578
|
|
579
|
+
describe "from_yaml_file" do
|
580
|
+
it "raises ArgumentError if the YAML file contains multiple documents" do
|
581
|
+
filename = "multiple_docs.yaml"
|
582
|
+
yaml = "---\n- resources:\n - type: false\n---\n-resources:\n - type: false\n"
|
583
|
+
allow(File).to receive(:file?).and_call_original
|
584
|
+
allow(File).to receive(:readable?).and_call_original
|
585
|
+
allow(IO).to receive(:read).and_call_original
|
586
|
+
allow(File).to receive(:file?).with(filename).and_return(true)
|
587
|
+
allow(File).to receive(:readable?).with(filename).and_return(true)
|
588
|
+
allow(IO).to receive(:read).with(filename).and_return(yaml)
|
589
|
+
expect { recipe.from_yaml_file(filename) }.to raise_error(ArgumentError, /contains multiple documents/)
|
590
|
+
end
|
591
|
+
|
592
|
+
it "raises IOError if the file does not exist" do
|
593
|
+
filename = "/nonexistent"
|
594
|
+
allow(File).to receive(:file?).and_call_original
|
595
|
+
allow(File).to receive(:file?).with(filename).and_return(false)
|
596
|
+
expect { recipe.from_yaml_file(filename) }.to raise_error(IOError, /Cannot open or read/)
|
597
|
+
end
|
598
|
+
end
|
599
|
+
|
600
|
+
describe "from_yaml" do
|
601
|
+
it "raises ArgumentError if the YAML is not a top-level hash" do
|
602
|
+
yaml = <<~YAML
|
603
|
+
---
|
604
|
+
- one
|
605
|
+
- resources
|
606
|
+
- three
|
607
|
+
YAML
|
608
|
+
expect { recipe.from_yaml(yaml) }.to raise_error(ArgumentError, /must contain a top-level 'resources' hash/)
|
609
|
+
end
|
610
|
+
|
611
|
+
it "raises ArgumentError if the YAML does not contain a resources hash" do
|
612
|
+
yaml = <<~YAML
|
613
|
+
---
|
614
|
+
- airplanes:
|
615
|
+
- type: "execute"
|
616
|
+
command: "whoami"
|
617
|
+
YAML
|
618
|
+
expect { recipe.from_yaml(yaml) }.to raise_error(ArgumentError, /must contain a top-level 'resources' hash/)
|
619
|
+
end
|
620
|
+
|
621
|
+
it "does not raise if the YAML contains a resources hash" do
|
622
|
+
yaml = <<~YAML
|
623
|
+
---
|
624
|
+
resources:
|
625
|
+
- type: "execute"
|
626
|
+
command: "whoami"
|
627
|
+
YAML
|
628
|
+
expect(recipe).to receive(:from_hash).with({ "resources" => [{ "command" => "whoami", "type" => "execute" }] })
|
629
|
+
recipe.from_yaml(yaml)
|
630
|
+
end
|
631
|
+
end
|
632
|
+
|
633
|
+
describe "from_hash" do
|
634
|
+
it "declares resources from a hash" do
|
635
|
+
resources = { "resources" => [
|
636
|
+
{ "name" => "running some commands", "type" => "execute", "command" => "whoami" },
|
637
|
+
{ "name" => "preparing the bits", "type" => "service", "action" => "start", "service_name" => "bit_launcher" },
|
638
|
+
] }
|
639
|
+
|
640
|
+
recipe.from_hash(resources)
|
641
|
+
expect(recipe.resources(execute: "running some commands").command).to eql("whoami")
|
642
|
+
expect(recipe.resources(service: "preparing the bits").service_name).to eql("bit_launcher")
|
643
|
+
expect(recipe.resources(service: "preparing the bits").action).to eql([:start])
|
644
|
+
end
|
645
|
+
end
|
646
|
+
|
579
647
|
describe "included DSL" do
|
580
648
|
it "should respond to :ps_credential from Chef::DSL::Powershell" do
|
581
649
|
expect(recipe.respond_to?(:ps_credential)).to be true
|
@@ -0,0 +1,120 @@
|
|
1
|
+
#
|
2
|
+
# Author:: Tim Smith (<tsmith@chef.io>)
|
3
|
+
# Copyright:: Copyright (c) Chef Software Inc.
|
4
|
+
# License:: Apache License, Version 2.0
|
5
|
+
#
|
6
|
+
# Licensed under the Apache License, Version 2.0 (the "License");
|
7
|
+
# you may not use this file except in compliance with the License.
|
8
|
+
# You may obtain a copy of the License at
|
9
|
+
#
|
10
|
+
# http://www.apache.org/licenses/LICENSE-2.0
|
11
|
+
#
|
12
|
+
# Unless required by applicable law or agreed to in writing, software
|
13
|
+
# distributed under the License is distributed on an "AS IS" BASIS,
|
14
|
+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
15
|
+
# See the License for the specific language governing permissions and
|
16
|
+
# limitations under the License.
|
17
|
+
#
|
18
|
+
|
19
|
+
require "spec_helper"
|
20
|
+
|
21
|
+
describe Chef::Resource::Alternatives do
|
22
|
+
let(:node) { Chef::Node.new }
|
23
|
+
let(:events) { Chef::EventDispatch::Dispatcher.new }
|
24
|
+
let(:run_context) { Chef::RunContext.new(node, {}, events) }
|
25
|
+
let(:resource) { Chef::Resource::Alternatives.new("fakey_fakerton", run_context) }
|
26
|
+
let(:provider) { resource.provider_for_action(:install) }
|
27
|
+
|
28
|
+
let(:alternatives_display_exists) do
|
29
|
+
double("shellout", stdout: <<-STDOUT)
|
30
|
+
java - auto mode
|
31
|
+
link best version is /usr/lib/jvm/java-8-openjdk-amd64/jre/bin/java
|
32
|
+
link currently points to /usr/lib/jvm/java-8-openjdk-amd64/jre/bin/java
|
33
|
+
link java is /usr/bin/java
|
34
|
+
slave java.1.gz is /usr/share/man/man1/java.1.gz
|
35
|
+
/usr/lib/jvm/java-8-openjdk-amd64/jre/bin/java - priority 1081
|
36
|
+
slave java.1.gz: /usr/lib/jvm/java-8-openjdk-amd64/jre/man/man1/java.1.gz
|
37
|
+
STDOUT
|
38
|
+
end
|
39
|
+
|
40
|
+
let(:alternatives_display_does_not_exist) do
|
41
|
+
double("shellout", stdout: "update-alternatives: error: no alternatives for fakey_fakerton")
|
42
|
+
end
|
43
|
+
|
44
|
+
it "the link_name property is the name_property" do
|
45
|
+
expect(resource.link_name).to eql("fakey_fakerton")
|
46
|
+
end
|
47
|
+
|
48
|
+
it "sets the default action as :install" do
|
49
|
+
expect(resource.action).to eql([:install])
|
50
|
+
end
|
51
|
+
|
52
|
+
it "coerces priority value to an Integer" do
|
53
|
+
resource.priority("1")
|
54
|
+
expect(resource.priority).to eql(1)
|
55
|
+
end
|
56
|
+
|
57
|
+
it "builds a default value for link based on link_name value" do
|
58
|
+
expect(resource.link).to eql("/usr/bin/fakey_fakerton")
|
59
|
+
end
|
60
|
+
|
61
|
+
it "supports :install, :auto, :refresh, and :remove actions" do
|
62
|
+
expect { resource.action :install }.not_to raise_error
|
63
|
+
expect { resource.action :auto }.not_to raise_error
|
64
|
+
expect { resource.action :refresh }.not_to raise_error
|
65
|
+
expect { resource.action :remove }.not_to raise_error
|
66
|
+
end
|
67
|
+
|
68
|
+
describe "#path_exists?" do
|
69
|
+
it "returns true if the path exists according to alternatives --display" do
|
70
|
+
allow(provider).to receive(:shell_out).with("alternatives", "--display", "fakey_fakerton").and_return(alternatives_display_exists)
|
71
|
+
expect(provider.path_exists?).to eql(true)
|
72
|
+
end
|
73
|
+
|
74
|
+
it "returns false if alternatives --display does not find a path" do
|
75
|
+
allow(provider).to receive(:shell_out).with("alternatives", "--display", "fakey_fakerton").and_return(alternatives_display_does_not_exist)
|
76
|
+
expect(provider.path_exists?).to eql(false)
|
77
|
+
end
|
78
|
+
end
|
79
|
+
|
80
|
+
describe "#current_path" do
|
81
|
+
it "extracts the current path by running alternatives --display" do
|
82
|
+
allow(provider).to receive(:shell_out).with("alternatives", "--display", "fakey_fakerton").and_return(alternatives_display_exists)
|
83
|
+
expect(provider.current_path).to eql("/usr/lib/jvm/java-8-openjdk-amd64/jre/bin/java")
|
84
|
+
end
|
85
|
+
end
|
86
|
+
|
87
|
+
describe "#path_priority" do
|
88
|
+
it "extracts the path priority by running alternatives --display" do
|
89
|
+
allow(provider).to receive(:shell_out).with("alternatives", "--display", "fakey_fakerton").and_return(alternatives_display_exists)
|
90
|
+
expect(provider.path_priority).to eql(1081)
|
91
|
+
end
|
92
|
+
end
|
93
|
+
|
94
|
+
describe "#alternatives_cmd" do
|
95
|
+
it "returns alternatives on fedora" do
|
96
|
+
node.automatic_attrs[:platform_family] = "fedora"
|
97
|
+
expect(provider.alternatives_cmd).to eql("alternatives")
|
98
|
+
end
|
99
|
+
|
100
|
+
it "returns alternatives on amazon" do
|
101
|
+
node.automatic_attrs[:platform_family] = "amazon"
|
102
|
+
expect(provider.alternatives_cmd).to eql("alternatives")
|
103
|
+
end
|
104
|
+
|
105
|
+
it "returns alternatives on suse" do
|
106
|
+
node.automatic_attrs[:platform_family] = "suse"
|
107
|
+
expect(provider.alternatives_cmd).to eql("alternatives")
|
108
|
+
end
|
109
|
+
|
110
|
+
it "returns alternatives on redhat" do
|
111
|
+
node.automatic_attrs[:platform_family] = "rhel"
|
112
|
+
expect(provider.alternatives_cmd).to eql("alternatives")
|
113
|
+
end
|
114
|
+
|
115
|
+
it "returns update-alternatives on debian" do
|
116
|
+
node.automatic_attrs[:platform_family] = "debian"
|
117
|
+
expect(provider.alternatives_cmd).to eql("update-alternatives")
|
118
|
+
end
|
119
|
+
end
|
120
|
+
end
|