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
data/lib/chef/dsl/core.rb
DELETED
@@ -1,52 +0,0 @@
|
|
1
|
-
#--
|
2
|
-
# Author:: Adam Jacob (<adam@chef.io>)
|
3
|
-
# Author:: Christopher Walters (<cw@chef.io>)
|
4
|
-
# Copyright:: Copyright (c) Chef Software Inc.
|
5
|
-
# License:: Apache License, Version 2.0
|
6
|
-
#
|
7
|
-
# Licensed under the Apache License, Version 2.0 (the "License");
|
8
|
-
# you may not use this file except in compliance with the License.
|
9
|
-
# You may obtain a copy of the License at
|
10
|
-
#
|
11
|
-
# http://www.apache.org/licenses/LICENSE-2.0
|
12
|
-
#
|
13
|
-
# Unless required by applicable law or agreed to in writing, software
|
14
|
-
# distributed under the License is distributed on an "AS IS" BASIS,
|
15
|
-
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
16
|
-
# See the License for the specific language governing permissions and
|
17
|
-
# limitations under the License.
|
18
|
-
#
|
19
|
-
|
20
|
-
require_relative "declare_resource"
|
21
|
-
require_relative "universal"
|
22
|
-
require_relative "../mixin/notifying_block"
|
23
|
-
require_relative "../mixin/lazy_module_include"
|
24
|
-
|
25
|
-
class Chef
|
26
|
-
module DSL
|
27
|
-
# Part of a family of DSL mixins.
|
28
|
-
#
|
29
|
-
# Chef::DSL::Recipe mixes into Recipes and LWRP Providers.
|
30
|
-
# - this does not target core chef resources and providers.
|
31
|
-
# - this is restricted to recipe/resource/provider context where a resource collection exists.
|
32
|
-
# - cookbook authors should typically include modules into here.
|
33
|
-
#
|
34
|
-
# Chef::DSL::Core mixes into Recipes, LWRP Providers and Core Providers
|
35
|
-
# - this adds cores providers on top of the Recipe DSL.
|
36
|
-
# - this is restricted to recipe/resource/provider context where a resource collection exists.
|
37
|
-
# - core chef authors should typically include modules into here.
|
38
|
-
#
|
39
|
-
# Chef::DSL::Universal mixes into Recipes, LWRP Resources+Providers, Core Resources+Providers, and Attributes files.
|
40
|
-
# - this adds resources and attributes files.
|
41
|
-
# - do not add helpers which manipulate the resource collection.
|
42
|
-
# - this is for general-purpose stuff that is useful nearly everywhere.
|
43
|
-
# - it also pollutes the namespace of nearly every context, watch out.
|
44
|
-
#
|
45
|
-
module Core
|
46
|
-
include Chef::DSL::Universal
|
47
|
-
include Chef::DSL::DeclareResource
|
48
|
-
include Chef::Mixin::NotifyingBlock
|
49
|
-
extend Chef::Mixin::LazyModuleInclude
|
50
|
-
end
|
51
|
-
end
|
52
|
-
end
|
@@ -1,41 +0,0 @@
|
|
1
|
-
#
|
2
|
-
# Author:: Nuo Yan (<nuo@chef.io>)
|
3
|
-
# Author:: Tim Hinderliter (<tim@chef.io>)
|
4
|
-
# Copyright:: Copyright (c) Chef Software Inc.
|
5
|
-
# License:: Apache License, Version 2.0
|
6
|
-
#
|
7
|
-
# Licensed under the Apache License, Version 2.0 (the "License");
|
8
|
-
# you may not use this file except in compliance with the License.
|
9
|
-
# You may obtain a copy of the License at
|
10
|
-
#
|
11
|
-
# http://www.apache.org/licenses/LICENSE-2.0
|
12
|
-
#
|
13
|
-
# Unless required by applicable law or agreed to in writing, software
|
14
|
-
# distributed under the License is distributed on an "AS IS" BASIS,
|
15
|
-
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
16
|
-
# See the License for the specific language governing permissions and
|
17
|
-
# limitations under the License.
|
18
|
-
#
|
19
|
-
|
20
|
-
require_relative "../knife"
|
21
|
-
require_relative "supermarket_share"
|
22
|
-
require_relative "../dist"
|
23
|
-
|
24
|
-
class Chef
|
25
|
-
class Knife
|
26
|
-
class CookbookSiteShare < Knife::SupermarketShare
|
27
|
-
|
28
|
-
# Handle the subclassing (knife doesn't do this :()
|
29
|
-
dependency_loaders.concat(superclass.dependency_loaders)
|
30
|
-
|
31
|
-
banner "knife cookbook site share COOKBOOK [CATEGORY] (options)"
|
32
|
-
category "deprecated"
|
33
|
-
|
34
|
-
def run
|
35
|
-
Chef::Log.warn("knife cookbook site share has been deprecated in favor of knife supermarket share. In #{Chef::Dist::PRODUCT} 16 (April 2020) this will result in an error!")
|
36
|
-
super
|
37
|
-
end
|
38
|
-
|
39
|
-
end
|
40
|
-
end
|
41
|
-
end
|
@@ -1,41 +0,0 @@
|
|
1
|
-
#
|
2
|
-
# Author:: Stephen Delano (<stephen@chef.io>)
|
3
|
-
# Author:: Tim Hinderliter (<tim@chef.io>)
|
4
|
-
# Copyright:: Copyright (c) Chef Software Inc.
|
5
|
-
# License:: Apache License, Version 2.0
|
6
|
-
#
|
7
|
-
# Licensed under the Apache License, Version 2.0 (the "License");
|
8
|
-
# you may not use this file except in compliance with the License.
|
9
|
-
# You may obtain a copy of the License at
|
10
|
-
#
|
11
|
-
# http://www.apache.org/licenses/LICENSE-2.0
|
12
|
-
#
|
13
|
-
# Unless required by applicable law or agreed to in writing, software
|
14
|
-
# distributed under the License is distributed on an "AS IS" BASIS,
|
15
|
-
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
16
|
-
# See the License for the specific language governing permissions and
|
17
|
-
# limitations under the License.
|
18
|
-
#
|
19
|
-
|
20
|
-
require_relative "../knife"
|
21
|
-
require_relative "supermarket_unshare"
|
22
|
-
require_relative "../dist"
|
23
|
-
|
24
|
-
class Chef
|
25
|
-
class Knife
|
26
|
-
class CookbookSiteUnshare < Knife::SupermarketUnshare
|
27
|
-
|
28
|
-
# Handle the subclassing (knife doesn't do this :()
|
29
|
-
dependency_loaders.concat(superclass.dependency_loaders)
|
30
|
-
|
31
|
-
banner "knife cookbook site unshare COOKBOOK (options)"
|
32
|
-
category "deprecated"
|
33
|
-
|
34
|
-
def run
|
35
|
-
Chef::Log.warn("knife cookbook site unshare has been deprecated in favor of knife supermarket unshare. In #{Chef::Dist::PRODUCT} 16 (April 2020) this will result in an error!")
|
36
|
-
super
|
37
|
-
end
|
38
|
-
|
39
|
-
end
|
40
|
-
end
|
41
|
-
end
|
@@ -1,93 +0,0 @@
|
|
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_relative "../provider"
|
20
|
-
require_relative "../dsl/declare_resource"
|
21
|
-
require_relative "noop"
|
22
|
-
require_relative "../log"
|
23
|
-
|
24
|
-
class Chef
|
25
|
-
class Provider
|
26
|
-
class AptPreference < Chef::Provider
|
27
|
-
provides :apt_preference, platform_family: "debian"
|
28
|
-
|
29
|
-
APT_PREFERENCE_DIR = "/etc/apt/preferences.d".freeze
|
30
|
-
|
31
|
-
def load_current_resource; end
|
32
|
-
|
33
|
-
action :add do
|
34
|
-
preference = build_pref(
|
35
|
-
new_resource.glob || new_resource.package_name,
|
36
|
-
new_resource.pin,
|
37
|
-
new_resource.pin_priority
|
38
|
-
)
|
39
|
-
|
40
|
-
declare_resource(:directory, APT_PREFERENCE_DIR) do
|
41
|
-
mode "0755"
|
42
|
-
action :create
|
43
|
-
end
|
44
|
-
|
45
|
-
sanitized_prefname = safe_name(new_resource.package_name)
|
46
|
-
|
47
|
-
# cleanup any existing pref files w/o the sanitized name (created by old apt cookbook)
|
48
|
-
if (sanitized_prefname != new_resource.package_name) && ::File.exist?("#{APT_PREFERENCE_DIR}/#{new_resource.package_name}.pref")
|
49
|
-
logger.warn "Replacing legacy #{new_resource.package_name}.pref with #{sanitized_prefname}.pref in #{APT_PREFERENCE_DIR}"
|
50
|
-
declare_resource(:file, "#{APT_PREFERENCE_DIR}/#{new_resource.package_name}.pref") do
|
51
|
-
action :delete
|
52
|
-
end
|
53
|
-
end
|
54
|
-
|
55
|
-
# cleanup any existing pref files without the .pref extension (created by old apt cookbook)
|
56
|
-
if ::File.exist?("#{APT_PREFERENCE_DIR}/#{new_resource.package_name}")
|
57
|
-
logger.warn "Replacing legacy #{new_resource.package_name} with #{sanitized_prefname}.pref in #{APT_PREFERENCE_DIR}"
|
58
|
-
declare_resource(:file, "#{APT_PREFERENCE_DIR}/#{new_resource.package_name}") do
|
59
|
-
action :delete
|
60
|
-
end
|
61
|
-
end
|
62
|
-
|
63
|
-
declare_resource(:file, "#{APT_PREFERENCE_DIR}/#{sanitized_prefname}.pref") do
|
64
|
-
mode "0644"
|
65
|
-
content preference
|
66
|
-
action :create
|
67
|
-
end
|
68
|
-
end
|
69
|
-
|
70
|
-
action :remove do
|
71
|
-
sanitized_prefname = safe_name(new_resource.package_name)
|
72
|
-
|
73
|
-
if ::File.exist?("#{APT_PREFERENCE_DIR}/#{sanitized_prefname}.pref")
|
74
|
-
logger.info "Un-pinning #{sanitized_prefname} from #{APT_PREFERENCE_DIR}"
|
75
|
-
declare_resource(:file, "#{APT_PREFERENCE_DIR}/#{sanitized_prefname}.pref") do
|
76
|
-
action :delete
|
77
|
-
end
|
78
|
-
end
|
79
|
-
end
|
80
|
-
|
81
|
-
# Build preferences.d file contents
|
82
|
-
def build_pref(package_name, pin, pin_priority)
|
83
|
-
"Package: #{package_name}\nPin: #{pin}\nPin-Priority: #{pin_priority}\n"
|
84
|
-
end
|
85
|
-
|
86
|
-
def safe_name(name)
|
87
|
-
name.tr(".", "_").gsub("*", "wildcard")
|
88
|
-
end
|
89
|
-
end
|
90
|
-
end
|
91
|
-
end
|
92
|
-
|
93
|
-
Chef::Provider::Noop.provides :apt_preference
|
@@ -1,358 +0,0 @@
|
|
1
|
-
#
|
2
|
-
# Author:: Thom May (<thom@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_relative "../resource"
|
20
|
-
require_relative "../dsl/declare_resource"
|
21
|
-
require_relative "../mixin/shell_out"
|
22
|
-
require_relative "../http/simple"
|
23
|
-
require_relative "noop"
|
24
|
-
require "tmpdir" unless defined?(Dir.mktmpdir)
|
25
|
-
|
26
|
-
class Chef
|
27
|
-
class Provider
|
28
|
-
class AptRepository < Chef::Provider
|
29
|
-
include Chef::Mixin::ShellOut
|
30
|
-
|
31
|
-
provides :apt_repository, platform_family: "debian"
|
32
|
-
|
33
|
-
LIST_APT_KEY_FINGERPRINTS = %w{apt-key adv --list-public-keys --with-fingerprint --with-colons}.freeze
|
34
|
-
|
35
|
-
def load_current_resource; end
|
36
|
-
|
37
|
-
action :add do
|
38
|
-
if new_resource.key.nil?
|
39
|
-
logger.debug "No 'key' property specified skipping key import"
|
40
|
-
else
|
41
|
-
new_resource.key.each do |k|
|
42
|
-
if is_key_id?(k) && !has_cookbook_file?(k)
|
43
|
-
install_key_from_keyserver(k)
|
44
|
-
else
|
45
|
-
install_key_from_uri(k)
|
46
|
-
end
|
47
|
-
end
|
48
|
-
end
|
49
|
-
|
50
|
-
declare_resource(:execute, "apt-cache gencaches") do
|
51
|
-
command %w{apt-cache gencaches}
|
52
|
-
default_env true
|
53
|
-
ignore_failure true
|
54
|
-
action :nothing
|
55
|
-
end
|
56
|
-
|
57
|
-
declare_resource(:apt_update, new_resource.name) do
|
58
|
-
ignore_failure true
|
59
|
-
action :nothing
|
60
|
-
end
|
61
|
-
|
62
|
-
cleanup_legacy_file!
|
63
|
-
|
64
|
-
repo = build_repo(
|
65
|
-
new_resource.uri,
|
66
|
-
new_resource.distribution,
|
67
|
-
repo_components,
|
68
|
-
new_resource.trusted,
|
69
|
-
new_resource.arch,
|
70
|
-
new_resource.deb_src
|
71
|
-
)
|
72
|
-
|
73
|
-
declare_resource(:file, "/etc/apt/sources.list.d/#{new_resource.repo_name}.list") do
|
74
|
-
owner "root"
|
75
|
-
group "root"
|
76
|
-
mode "0644"
|
77
|
-
content repo
|
78
|
-
sensitive new_resource.sensitive
|
79
|
-
action :create
|
80
|
-
notifies :run, "execute[apt-cache gencaches]", :immediately
|
81
|
-
notifies :update, "apt_update[#{new_resource.name}]", :immediately if new_resource.cache_rebuild
|
82
|
-
end
|
83
|
-
end
|
84
|
-
|
85
|
-
action :remove do
|
86
|
-
cleanup_legacy_file!
|
87
|
-
if ::File.exist?("/etc/apt/sources.list.d/#{new_resource.repo_name}.list")
|
88
|
-
converge_by "Removing #{new_resource.repo_name} repository from /etc/apt/sources.list.d/" do
|
89
|
-
declare_resource(:file, "/etc/apt/sources.list.d/#{new_resource.repo_name}.list") do
|
90
|
-
sensitive new_resource.sensitive
|
91
|
-
action :delete
|
92
|
-
notifies :update, "apt_update[#{new_resource.name}]", :immediately if new_resource.cache_rebuild
|
93
|
-
end
|
94
|
-
|
95
|
-
declare_resource(:apt_update, new_resource.name) do
|
96
|
-
ignore_failure true
|
97
|
-
action :nothing
|
98
|
-
end
|
99
|
-
end
|
100
|
-
else
|
101
|
-
logger.trace("/etc/apt/sources.list.d/#{new_resource.repo_name}.list does not exist. Nothing to do")
|
102
|
-
end
|
103
|
-
end
|
104
|
-
|
105
|
-
# is the provided ID a key ID from a keyserver. Looks at length and HEX only values
|
106
|
-
# @param [String] id the key value passed by the user that *may* be an ID
|
107
|
-
def is_key_id?(id)
|
108
|
-
id = id[2..-1] if id.start_with?("0x")
|
109
|
-
id =~ /^\h+$/ && [8, 16, 40].include?(id.length)
|
110
|
-
end
|
111
|
-
|
112
|
-
# run the specified command and extract the fingerprints from the output
|
113
|
-
# accepts a command so it can be used to extract both the current key's fingerprints
|
114
|
-
# and the fingerprint of the new key
|
115
|
-
# @param [Array<String>] cmd the command to run
|
116
|
-
#
|
117
|
-
# @return [Array] an array of fingerprints
|
118
|
-
def extract_fingerprints_from_cmd(*cmd)
|
119
|
-
so = shell_out(*cmd)
|
120
|
-
so.stdout.split(/\n/).map do |t|
|
121
|
-
if z = t.match(/^fpr:+([0-9A-F]+):/)
|
122
|
-
z[1].split.join
|
123
|
-
end
|
124
|
-
end.compact
|
125
|
-
end
|
126
|
-
|
127
|
-
# validate the key against the apt keystore to see if that version is expired
|
128
|
-
# @param [String] key
|
129
|
-
#
|
130
|
-
# @return [Boolean] is the key valid or not
|
131
|
-
def key_is_valid?(key)
|
132
|
-
valid = true
|
133
|
-
|
134
|
-
so = shell_out("apt-key", "list")
|
135
|
-
so.stdout.split(/\n/).map do |t|
|
136
|
-
if t =~ %r{^\/#{key}.*\[expired: .*\]$}
|
137
|
-
logger.debug "Found expired key: #{t}"
|
138
|
-
valid = false
|
139
|
-
break
|
140
|
-
end
|
141
|
-
end
|
142
|
-
|
143
|
-
logger.debug "key #{key} #{valid ? "is valid" : "is not valid"}"
|
144
|
-
valid
|
145
|
-
end
|
146
|
-
|
147
|
-
# return the specified cookbook name or the cookbook containing the
|
148
|
-
# resource.
|
149
|
-
#
|
150
|
-
# @return [String] name of the cookbook
|
151
|
-
def cookbook_name
|
152
|
-
new_resource.cookbook || new_resource.cookbook_name
|
153
|
-
end
|
154
|
-
|
155
|
-
# determine if a cookbook file is available in the run
|
156
|
-
# @param [String] fn the path to the cookbook file
|
157
|
-
#
|
158
|
-
# @return [Boolean] cookbook file exists or doesn't
|
159
|
-
def has_cookbook_file?(fn)
|
160
|
-
run_context.has_cookbook_file_in_cookbook?(cookbook_name, fn)
|
161
|
-
end
|
162
|
-
|
163
|
-
# determine if there are any new keys by comparing the fingerprints of installed
|
164
|
-
# keys to those of the passed file
|
165
|
-
# @param [String] file the keyfile of the new repository
|
166
|
-
#
|
167
|
-
# @return [Boolean] true: no new keys in the file. false: there are new keys
|
168
|
-
def no_new_keys?(file)
|
169
|
-
# Now we are using the option --with-colons that works across old os versions
|
170
|
-
# as well as the latest (16.10). This for both `apt-key` and `gpg` commands
|
171
|
-
installed_keys = extract_fingerprints_from_cmd(*LIST_APT_KEY_FINGERPRINTS)
|
172
|
-
proposed_keys = extract_fingerprints_from_cmd("gpg", "--with-fingerprint", "--with-colons", file)
|
173
|
-
(installed_keys & proposed_keys).sort == proposed_keys.sort
|
174
|
-
end
|
175
|
-
|
176
|
-
# Given the provided key URI determine what kind of chef resource we need
|
177
|
-
# to fetch the key
|
178
|
-
# @param [String] uri the uri of the gpg key (local path or http URL)
|
179
|
-
#
|
180
|
-
# @raise [Chef::Exceptions::FileNotFound] Key isn't remote or found in the current run
|
181
|
-
#
|
182
|
-
# @return [Symbol] :remote_file or :cookbook_file
|
183
|
-
def key_type(uri)
|
184
|
-
if uri.start_with?("http")
|
185
|
-
:remote_file
|
186
|
-
elsif has_cookbook_file?(uri)
|
187
|
-
:cookbook_file
|
188
|
-
else
|
189
|
-
raise Chef::Exceptions::FileNotFound, "Cannot locate key file: #{uri}"
|
190
|
-
end
|
191
|
-
end
|
192
|
-
|
193
|
-
# Fetch the key using either cookbook_file or remote_file, validate it,
|
194
|
-
# and install it with apt-key add
|
195
|
-
# @param [String] key the key to install
|
196
|
-
#
|
197
|
-
# @raise [RuntimeError] Invalid key which can't verify the apt repository
|
198
|
-
#
|
199
|
-
# @return [void]
|
200
|
-
def install_key_from_uri(key)
|
201
|
-
key_name = key.gsub(/[^0-9A-Za-z\-]/, "_")
|
202
|
-
cached_keyfile = ::File.join(Chef::Config[:file_cache_path], key_name)
|
203
|
-
tmp_dir = Dir.mktmpdir(".gpg")
|
204
|
-
at_exit { FileUtils.remove_entry(tmp_dir) }
|
205
|
-
|
206
|
-
declare_resource(key_type(key), cached_keyfile) do
|
207
|
-
source key
|
208
|
-
mode "0644"
|
209
|
-
sensitive new_resource.sensitive
|
210
|
-
action :create
|
211
|
-
verify "gpg --homedir #{tmp_dir} %{path}"
|
212
|
-
end
|
213
|
-
|
214
|
-
declare_resource(:execute, "apt-key add #{cached_keyfile}") do
|
215
|
-
command [ "apt-key", "add", cached_keyfile ]
|
216
|
-
default_env true
|
217
|
-
sensitive new_resource.sensitive
|
218
|
-
action :run
|
219
|
-
not_if { no_new_keys?(cached_keyfile) }
|
220
|
-
notifies :run, "execute[apt-cache gencaches]", :immediately
|
221
|
-
end
|
222
|
-
end
|
223
|
-
|
224
|
-
# build the apt-key command to install the keyserver
|
225
|
-
# @param [String] key the key to install
|
226
|
-
# @param [String] keyserver the key server to use
|
227
|
-
#
|
228
|
-
# @return [String] the full apt-key command to run
|
229
|
-
def keyserver_install_cmd(key, keyserver)
|
230
|
-
cmd = "apt-key adv --no-tty --recv"
|
231
|
-
cmd << " --keyserver-options http-proxy=#{new_resource.key_proxy}" if new_resource.key_proxy
|
232
|
-
cmd << " --keyserver "
|
233
|
-
cmd << if keyserver.start_with?("hkp://")
|
234
|
-
keyserver
|
235
|
-
else
|
236
|
-
"hkp://#{keyserver}:80"
|
237
|
-
end
|
238
|
-
|
239
|
-
cmd << " #{key}"
|
240
|
-
cmd
|
241
|
-
end
|
242
|
-
|
243
|
-
# @param [String] key
|
244
|
-
# @param [String] keyserver
|
245
|
-
#
|
246
|
-
# @raise [RuntimeError] Invalid key which can't verify the apt repository
|
247
|
-
#
|
248
|
-
# @return [void]
|
249
|
-
def install_key_from_keyserver(key, keyserver = new_resource.keyserver)
|
250
|
-
declare_resource(:execute, "install-key #{key}") do
|
251
|
-
command keyserver_install_cmd(key, keyserver)
|
252
|
-
default_env true
|
253
|
-
sensitive new_resource.sensitive
|
254
|
-
not_if do
|
255
|
-
present = extract_fingerprints_from_cmd(*LIST_APT_KEY_FINGERPRINTS).any? do |fp|
|
256
|
-
fp.end_with? key.upcase
|
257
|
-
end
|
258
|
-
present && key_is_valid?(key.upcase)
|
259
|
-
end
|
260
|
-
notifies :run, "execute[apt-cache gencaches]", :immediately
|
261
|
-
end
|
262
|
-
|
263
|
-
raise "The key #{key} is invalid and cannot be used to verify an apt repository." unless key_is_valid?(key.upcase)
|
264
|
-
end
|
265
|
-
|
266
|
-
# @param [String] owner
|
267
|
-
# @param [String] repo
|
268
|
-
#
|
269
|
-
# @raise [RuntimeError] Could not access the Launchpad PPA API
|
270
|
-
#
|
271
|
-
# @return [void]
|
272
|
-
def install_ppa_key(owner, repo)
|
273
|
-
url = "https://launchpad.net/api/1.0/~#{owner}/+archive/#{repo}"
|
274
|
-
key_id = Chef::HTTP::Simple.new(url).get("signing_key_fingerprint").delete('"')
|
275
|
-
install_key_from_keyserver(key_id, "keyserver.ubuntu.com")
|
276
|
-
rescue Net::HTTPClientException => e
|
277
|
-
raise "Could not access Launchpad ppa API: #{e.message}"
|
278
|
-
end
|
279
|
-
|
280
|
-
# determine if the repository URL is a PPA
|
281
|
-
# @param [String] url the url of the repository
|
282
|
-
#
|
283
|
-
# @return [Boolean] is the repo URL a PPA
|
284
|
-
def is_ppa_url?(url)
|
285
|
-
url.start_with?("ppa:")
|
286
|
-
end
|
287
|
-
|
288
|
-
# determine the repository's components:
|
289
|
-
# - "components" property if defined
|
290
|
-
# - "main" if "components" not defined and the repo is a PPA URL
|
291
|
-
# - otherwise nothing
|
292
|
-
#
|
293
|
-
# @return [String] the repository component
|
294
|
-
def repo_components
|
295
|
-
if is_ppa_url?(new_resource.uri) && new_resource.components.empty?
|
296
|
-
"main"
|
297
|
-
else
|
298
|
-
new_resource.components
|
299
|
-
end
|
300
|
-
end
|
301
|
-
|
302
|
-
# given a PPA return a PPA URL in http://ppa.launchpad.net format
|
303
|
-
# @param [String] ppa the ppa URL
|
304
|
-
#
|
305
|
-
# @return [String] full PPA URL
|
306
|
-
def make_ppa_url(ppa)
|
307
|
-
owner, repo = ppa[4..-1].split("/")
|
308
|
-
repo ||= "ppa"
|
309
|
-
|
310
|
-
install_ppa_key(owner, repo)
|
311
|
-
"http://ppa.launchpad.net/#{owner}/#{repo}/ubuntu"
|
312
|
-
end
|
313
|
-
|
314
|
-
# build complete repo text that will be written to the config
|
315
|
-
# @param [String] uri
|
316
|
-
# @param [Array] components
|
317
|
-
# @param [Boolean] trusted
|
318
|
-
# @param [String] arch
|
319
|
-
# @param [Boolean] add_src
|
320
|
-
#
|
321
|
-
# @return [String] complete repo config text
|
322
|
-
def build_repo(uri, distribution, components, trusted, arch, add_src = false)
|
323
|
-
uri = make_ppa_url(uri) if is_ppa_url?(uri)
|
324
|
-
uri = URI.escape(uri)
|
325
|
-
components = Array(components).join(" ")
|
326
|
-
options = []
|
327
|
-
options << "arch=#{arch}" if arch
|
328
|
-
options << "trusted=yes" if trusted
|
329
|
-
optstr = unless options.empty?
|
330
|
-
"[" + options.join(" ") + "]"
|
331
|
-
end
|
332
|
-
info = [ optstr, uri, distribution, components ].compact.join(" ")
|
333
|
-
repo = "deb #{info}\n"
|
334
|
-
repo << "deb-src #{info}\n" if add_src
|
335
|
-
repo
|
336
|
-
end
|
337
|
-
|
338
|
-
# clean up a potentially legacy file from before we fixed the usage of
|
339
|
-
# new_resource.name vs. new_resource.repo_name. We might have the
|
340
|
-
# name.list file hanging around and need to clean it up.
|
341
|
-
#
|
342
|
-
# @return [void]
|
343
|
-
def cleanup_legacy_file!
|
344
|
-
legacy_path = "/etc/apt/sources.list.d/#{new_resource.name}.list"
|
345
|
-
if new_resource.name != new_resource.repo_name && ::File.exist?(legacy_path)
|
346
|
-
converge_by "Cleaning up legacy #{legacy_path} repo file" do
|
347
|
-
declare_resource(:file, legacy_path) do
|
348
|
-
action :delete
|
349
|
-
# Not triggering an update since it isn't super likely to be needed.
|
350
|
-
end
|
351
|
-
end
|
352
|
-
end
|
353
|
-
end
|
354
|
-
end
|
355
|
-
end
|
356
|
-
end
|
357
|
-
|
358
|
-
Chef::Provider::Noop.provides :apt_repository
|