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
@@ -17,18 +17,23 @@
|
|
17
17
|
#
|
18
18
|
|
19
19
|
require_relative "../resource"
|
20
|
+
require_relative "../http/simple"
|
21
|
+
require "tmpdir" unless defined?(Dir.mktmpdir)
|
22
|
+
require "addressable" unless defined?(Addressable)
|
20
23
|
|
21
24
|
class Chef
|
22
25
|
class Resource
|
23
26
|
class AptRepository < Chef::Resource
|
24
|
-
|
27
|
+
unified_mode true
|
28
|
+
|
25
29
|
provides(:apt_repository) { true }
|
26
30
|
|
27
|
-
description "Use the apt_repository resource to specify additional APT repositories. Adding a new repository will update the APT package cache immediately."
|
31
|
+
description "Use the **apt_repository** resource to specify additional APT repositories. Adding a new repository will update the APT package cache immediately."
|
28
32
|
introduced "12.9"
|
29
33
|
|
30
34
|
examples <<~DOC
|
31
|
-
Add repository with basic settings
|
35
|
+
**Add repository with basic settings**:
|
36
|
+
|
32
37
|
```ruby
|
33
38
|
apt_repository 'nginx' do
|
34
39
|
uri 'http://nginx.org/packages/ubuntu/'
|
@@ -36,29 +41,32 @@ class Chef
|
|
36
41
|
end
|
37
42
|
```
|
38
43
|
|
39
|
-
Enable Ubuntu multiverse repositories
|
44
|
+
**Enable Ubuntu multiverse repositories**:
|
45
|
+
|
40
46
|
```ruby
|
41
47
|
apt_repository 'security-ubuntu-multiverse' do
|
42
48
|
uri 'http://security.ubuntu.com/ubuntu'
|
43
|
-
distribution '
|
49
|
+
distribution 'xenial-security'
|
44
50
|
components ['multiverse']
|
45
51
|
deb_src true
|
46
52
|
end
|
47
53
|
```
|
48
54
|
|
49
|
-
Add the Nginx PPA, autodetect the key and repository url
|
55
|
+
**Add the Nginx PPA, autodetect the key and repository url**:
|
56
|
+
|
50
57
|
```ruby
|
51
58
|
apt_repository 'nginx-php' do
|
52
59
|
uri 'ppa:nginx/stable'
|
53
60
|
end
|
54
61
|
```
|
55
62
|
|
56
|
-
Add the JuJu PPA, grab the key from the keyserver, and add source repo
|
63
|
+
**Add the JuJu PPA, grab the key from the keyserver, and add source repo**:
|
64
|
+
|
57
65
|
```ruby
|
58
66
|
apt_repository 'juju' do
|
59
67
|
uri 'http://ppa.launchpad.net/juju/stable/ubuntu'
|
60
68
|
components ['main']
|
61
|
-
distribution '
|
69
|
+
distribution 'xenial'
|
62
70
|
key 'C8068B11'
|
63
71
|
keyserver 'keyserver.ubuntu.com'
|
64
72
|
action :add
|
@@ -66,7 +74,8 @@ class Chef
|
|
66
74
|
end
|
67
75
|
```
|
68
76
|
|
69
|
-
Add repository that requires multiple keys to authenticate packages
|
77
|
+
**Add repository that requires multiple keys to authenticate packages**:
|
78
|
+
|
70
79
|
```ruby
|
71
80
|
apt_repository 'rundeck' do
|
72
81
|
uri 'https://dl.bintray.com/rundeck/rundeck-deb'
|
@@ -77,18 +86,20 @@ class Chef
|
|
77
86
|
end
|
78
87
|
```
|
79
88
|
|
80
|
-
Add the Cloudera Repo of CDH4 packages for Ubuntu
|
89
|
+
**Add the Cloudera Repo of CDH4 packages for Ubuntu 16.04 on AMD64**:
|
90
|
+
|
81
91
|
```ruby
|
82
92
|
apt_repository 'cloudera' do
|
83
|
-
uri 'http://archive.cloudera.com/cdh4/ubuntu/
|
93
|
+
uri 'http://archive.cloudera.com/cdh4/ubuntu/xenial/amd64/cdh'
|
84
94
|
arch 'amd64'
|
85
|
-
distribution '
|
95
|
+
distribution 'xenial-cdh4'
|
86
96
|
components ['contrib']
|
87
97
|
key 'http://archive.cloudera.com/debian/archive.key'
|
88
98
|
end
|
89
99
|
```
|
90
100
|
|
91
|
-
Remove a repository from the list
|
101
|
+
**Remove a repository from the list**:
|
102
|
+
|
92
103
|
```ruby
|
93
104
|
apt_repository 'zenoss' do
|
94
105
|
action :remove
|
@@ -111,15 +122,15 @@ class Chef
|
|
111
122
|
description: "The base of the Debian distribution."
|
112
123
|
|
113
124
|
property :distribution, [ String, nil, FalseClass ],
|
114
|
-
description: "Usually a distribution's codename, such as
|
115
|
-
default: lazy { node["lsb"]["codename"] }, default_description: "The LSB codename of the
|
125
|
+
description: "Usually a distribution's codename, such as `xenial`, `bionic`, or `focal`.",
|
126
|
+
default: lazy { node["lsb"]["codename"] }, default_description: "The LSB codename of the node such as 'focal'."
|
116
127
|
|
117
128
|
property :components, Array,
|
118
129
|
description: "Package groupings, such as 'main' and 'stable'.",
|
119
|
-
default: lazy { [] }
|
130
|
+
default: lazy { [] }, default_description: "`main` if using a PPA repository."
|
120
131
|
|
121
132
|
property :arch, [String, nil, FalseClass],
|
122
|
-
description: "Constrain packages to a particular CPU architecture such as
|
133
|
+
description: "Constrain packages to a particular CPU architecture such as `i386` or `amd64`."
|
123
134
|
|
124
135
|
property :trusted, [TrueClass, FalseClass],
|
125
136
|
description: "Determines whether you should treat all packages from this repository as authenticated regardless of signature.",
|
@@ -138,7 +149,7 @@ class Chef
|
|
138
149
|
default: lazy { [] }, coerce: proc { |x| x ? Array(x) : x }
|
139
150
|
|
140
151
|
property :key_proxy, [String, nil, FalseClass],
|
141
|
-
description: "If set, a specified proxy is passed to GPG via http-proxy
|
152
|
+
description: "If set, a specified proxy is passed to GPG via `http-proxy=`."
|
142
153
|
|
143
154
|
property :cookbook, [String, nil, FalseClass],
|
144
155
|
description: "If key should be a cookbook_file, specify a cookbook where the key is located for files/default. Default value is nil, so it will use the cookbook where the resource is used.",
|
@@ -150,6 +161,334 @@ class Chef
|
|
150
161
|
|
151
162
|
default_action :add
|
152
163
|
allowed_actions :add, :remove
|
164
|
+
|
165
|
+
action_class do
|
166
|
+
LIST_APT_KEY_FINGERPRINTS = %w{apt-key adv --list-public-keys --with-fingerprint --with-colons}.freeze
|
167
|
+
|
168
|
+
# is the provided ID a key ID from a keyserver. Looks at length and HEX only values
|
169
|
+
# @param [String] id the key value passed by the user that *may* be an ID
|
170
|
+
def is_key_id?(id)
|
171
|
+
id = id[2..-1] if id.start_with?("0x")
|
172
|
+
id =~ /^\h+$/ && [8, 16, 40].include?(id.length)
|
173
|
+
end
|
174
|
+
|
175
|
+
# run the specified command and extract the fingerprints from the output
|
176
|
+
# accepts a command so it can be used to extract both the current key's fingerprints
|
177
|
+
# and the fingerprint of the new key
|
178
|
+
# @param [Array<String>] cmd the command to run
|
179
|
+
#
|
180
|
+
# @return [Array] an array of fingerprints
|
181
|
+
def extract_fingerprints_from_cmd(*cmd)
|
182
|
+
so = shell_out(*cmd)
|
183
|
+
so.stdout.split(/\n/).map do |t|
|
184
|
+
if z = t.match(/^fpr:+([0-9A-F]+):/)
|
185
|
+
z[1].split.join
|
186
|
+
end
|
187
|
+
end.compact
|
188
|
+
end
|
189
|
+
|
190
|
+
# validate the key against the apt keystore to see if that version is expired
|
191
|
+
# @param [String] key
|
192
|
+
#
|
193
|
+
# @return [Boolean] is the key valid or not
|
194
|
+
def key_is_valid?(key)
|
195
|
+
valid = true
|
196
|
+
|
197
|
+
so = shell_out("apt-key", "list")
|
198
|
+
so.stdout.split(/\n/).map do |t|
|
199
|
+
if t =~ %r{^\/#{key}.*\[expired: .*\]$}
|
200
|
+
logger.debug "Found expired key: #{t}"
|
201
|
+
valid = false
|
202
|
+
break
|
203
|
+
end
|
204
|
+
end
|
205
|
+
|
206
|
+
logger.debug "key #{key} #{valid ? "is valid" : "is not valid"}"
|
207
|
+
valid
|
208
|
+
end
|
209
|
+
|
210
|
+
# return the specified cookbook name or the cookbook containing the
|
211
|
+
# resource.
|
212
|
+
#
|
213
|
+
# @return [String] name of the cookbook
|
214
|
+
def cookbook_name
|
215
|
+
new_resource.cookbook || new_resource.cookbook_name
|
216
|
+
end
|
217
|
+
|
218
|
+
# determine if a cookbook file is available in the run
|
219
|
+
# @param [String] fn the path to the cookbook file
|
220
|
+
#
|
221
|
+
# @return [Boolean] cookbook file exists or doesn't
|
222
|
+
def has_cookbook_file?(fn)
|
223
|
+
run_context.has_cookbook_file_in_cookbook?(cookbook_name, fn)
|
224
|
+
end
|
225
|
+
|
226
|
+
# determine if there are any new keys by comparing the fingerprints of installed
|
227
|
+
# keys to those of the passed file
|
228
|
+
# @param [String] file the keyfile of the new repository
|
229
|
+
#
|
230
|
+
# @return [Boolean] true: no new keys in the file. false: there are new keys
|
231
|
+
def no_new_keys?(file)
|
232
|
+
# Now we are using the option --with-colons that works across old os versions
|
233
|
+
# as well as the latest (16.10). This for both `apt-key` and `gpg` commands
|
234
|
+
installed_keys = extract_fingerprints_from_cmd(*LIST_APT_KEY_FINGERPRINTS)
|
235
|
+
proposed_keys = extract_fingerprints_from_cmd("gpg", "--with-fingerprint", "--with-colons", file)
|
236
|
+
(installed_keys & proposed_keys).sort == proposed_keys.sort
|
237
|
+
end
|
238
|
+
|
239
|
+
# Given the provided key URI determine what kind of chef resource we need
|
240
|
+
# to fetch the key
|
241
|
+
# @param [String] uri the uri of the gpg key (local path or http URL)
|
242
|
+
#
|
243
|
+
# @raise [Chef::Exceptions::FileNotFound] Key isn't remote or found in the current run
|
244
|
+
#
|
245
|
+
# @return [Symbol] :remote_file or :cookbook_file
|
246
|
+
def key_type(uri)
|
247
|
+
if uri.start_with?("http")
|
248
|
+
:remote_file
|
249
|
+
elsif has_cookbook_file?(uri)
|
250
|
+
:cookbook_file
|
251
|
+
else
|
252
|
+
raise Chef::Exceptions::FileNotFound, "Cannot locate key file: #{uri}"
|
253
|
+
end
|
254
|
+
end
|
255
|
+
|
256
|
+
# Fetch the key using either cookbook_file or remote_file, validate it,
|
257
|
+
# and install it with apt-key add
|
258
|
+
# @param [String] key the key to install
|
259
|
+
#
|
260
|
+
# @raise [RuntimeError] Invalid key which can't verify the apt repository
|
261
|
+
#
|
262
|
+
# @return [void]
|
263
|
+
def install_key_from_uri(key)
|
264
|
+
key_name = key.gsub(/[^0-9A-Za-z\-]/, "_")
|
265
|
+
cached_keyfile = ::File.join(Chef::Config[:file_cache_path], key_name)
|
266
|
+
tmp_dir = Dir.mktmpdir(".gpg")
|
267
|
+
at_exit { FileUtils.remove_entry(tmp_dir) }
|
268
|
+
|
269
|
+
declare_resource(key_type(key), cached_keyfile) do
|
270
|
+
source key
|
271
|
+
mode "0644"
|
272
|
+
sensitive new_resource.sensitive
|
273
|
+
action :create
|
274
|
+
verify "gpg --homedir #{tmp_dir} %{path}"
|
275
|
+
end
|
276
|
+
|
277
|
+
execute "apt-key add #{cached_keyfile}" do
|
278
|
+
command [ "apt-key", "add", cached_keyfile ]
|
279
|
+
default_env true
|
280
|
+
sensitive new_resource.sensitive
|
281
|
+
action :run
|
282
|
+
not_if { no_new_keys?(cached_keyfile) }
|
283
|
+
notifies :run, "execute[apt-cache gencaches]", :immediately
|
284
|
+
end
|
285
|
+
end
|
286
|
+
|
287
|
+
# build the apt-key command to install the keyserver
|
288
|
+
# @param [String] key the key to install
|
289
|
+
# @param [String] keyserver the key server to use
|
290
|
+
#
|
291
|
+
# @return [String] the full apt-key command to run
|
292
|
+
def keyserver_install_cmd(key, keyserver)
|
293
|
+
cmd = "apt-key adv --no-tty --recv"
|
294
|
+
cmd << " --keyserver-options http-proxy=#{new_resource.key_proxy}" if new_resource.key_proxy
|
295
|
+
cmd << " --keyserver "
|
296
|
+
cmd << if keyserver.start_with?("hkp://")
|
297
|
+
keyserver
|
298
|
+
else
|
299
|
+
"hkp://#{keyserver}:80"
|
300
|
+
end
|
301
|
+
|
302
|
+
cmd << " #{key}"
|
303
|
+
cmd
|
304
|
+
end
|
305
|
+
|
306
|
+
# @param [String] key
|
307
|
+
# @param [String] keyserver
|
308
|
+
#
|
309
|
+
# @raise [RuntimeError] Invalid key which can't verify the apt repository
|
310
|
+
#
|
311
|
+
# @return [void]
|
312
|
+
def install_key_from_keyserver(key, keyserver = new_resource.keyserver)
|
313
|
+
execute "install-key #{key}" do
|
314
|
+
command keyserver_install_cmd(key, keyserver)
|
315
|
+
default_env true
|
316
|
+
sensitive new_resource.sensitive
|
317
|
+
not_if do
|
318
|
+
present = extract_fingerprints_from_cmd(*LIST_APT_KEY_FINGERPRINTS).any? do |fp|
|
319
|
+
fp.end_with? key.upcase
|
320
|
+
end
|
321
|
+
present && key_is_valid?(key.upcase)
|
322
|
+
end
|
323
|
+
notifies :run, "execute[apt-cache gencaches]", :immediately
|
324
|
+
end
|
325
|
+
|
326
|
+
raise "The key #{key} is invalid and cannot be used to verify an apt repository." unless key_is_valid?(key.upcase)
|
327
|
+
end
|
328
|
+
|
329
|
+
# @param [String] owner
|
330
|
+
# @param [String] repo
|
331
|
+
#
|
332
|
+
# @raise [RuntimeError] Could not access the Launchpad PPA API
|
333
|
+
#
|
334
|
+
# @return [void]
|
335
|
+
def install_ppa_key(owner, repo)
|
336
|
+
url = "https://launchpad.net/api/1.0/~#{owner}/+archive/#{repo}"
|
337
|
+
key_id = Chef::HTTP::Simple.new(url).get("signing_key_fingerprint").delete('"')
|
338
|
+
install_key_from_keyserver(key_id, "keyserver.ubuntu.com")
|
339
|
+
rescue Net::HTTPClientException => e
|
340
|
+
raise "Could not access Launchpad ppa API: #{e.message}"
|
341
|
+
end
|
342
|
+
|
343
|
+
# determine if the repository URL is a PPA
|
344
|
+
# @param [String] url the url of the repository
|
345
|
+
#
|
346
|
+
# @return [Boolean] is the repo URL a PPA
|
347
|
+
def is_ppa_url?(url)
|
348
|
+
url.start_with?("ppa:")
|
349
|
+
end
|
350
|
+
|
351
|
+
# determine the repository's components:
|
352
|
+
# - "components" property if defined
|
353
|
+
# - "main" if "components" not defined and the repo is a PPA URL
|
354
|
+
# - otherwise nothing
|
355
|
+
#
|
356
|
+
# @return [String] the repository component
|
357
|
+
def repo_components
|
358
|
+
if is_ppa_url?(new_resource.uri) && new_resource.components.empty?
|
359
|
+
"main"
|
360
|
+
else
|
361
|
+
new_resource.components
|
362
|
+
end
|
363
|
+
end
|
364
|
+
|
365
|
+
# given a PPA return a PPA URL in http://ppa.launchpad.net format
|
366
|
+
# @param [String] ppa the ppa URL
|
367
|
+
#
|
368
|
+
# @return [String] full PPA URL
|
369
|
+
def make_ppa_url(ppa)
|
370
|
+
owner, repo = ppa[4..-1].split("/")
|
371
|
+
repo ||= "ppa"
|
372
|
+
|
373
|
+
install_ppa_key(owner, repo)
|
374
|
+
"http://ppa.launchpad.net/#{owner}/#{repo}/ubuntu"
|
375
|
+
end
|
376
|
+
|
377
|
+
# build complete repo text that will be written to the config
|
378
|
+
# @param [String] uri
|
379
|
+
# @param [Array] components
|
380
|
+
# @param [Boolean] trusted
|
381
|
+
# @param [String] arch
|
382
|
+
# @param [Boolean] add_src
|
383
|
+
#
|
384
|
+
# @return [String] complete repo config text
|
385
|
+
def build_repo(uri, distribution, components, trusted, arch, add_src = false)
|
386
|
+
uri = make_ppa_url(uri) if is_ppa_url?(uri)
|
387
|
+
|
388
|
+
uri = Addressable::URI.parse(uri)
|
389
|
+
components = Array(components).join(" ")
|
390
|
+
options = []
|
391
|
+
options << "arch=#{arch}" if arch
|
392
|
+
options << "trusted=yes" if trusted
|
393
|
+
optstr = unless options.empty?
|
394
|
+
"[" + options.join(" ") + "]"
|
395
|
+
end
|
396
|
+
info = [ optstr, uri.normalize.to_s, distribution, components ].compact.join(" ")
|
397
|
+
repo = "deb #{info}\n"
|
398
|
+
repo << "deb-src #{info}\n" if add_src
|
399
|
+
repo
|
400
|
+
end
|
401
|
+
|
402
|
+
# clean up a potentially legacy file from before we fixed the usage of
|
403
|
+
# new_resource.name vs. new_resource.repo_name. We might have the
|
404
|
+
# name.list file hanging around and need to clean it up.
|
405
|
+
#
|
406
|
+
# @return [void]
|
407
|
+
def cleanup_legacy_file!
|
408
|
+
legacy_path = "/etc/apt/sources.list.d/#{new_resource.name}.list"
|
409
|
+
if new_resource.name != new_resource.repo_name && ::File.exist?(legacy_path)
|
410
|
+
converge_by "Cleaning up legacy #{legacy_path} repo file" do
|
411
|
+
file legacy_path do
|
412
|
+
action :delete
|
413
|
+
# Not triggering an update since it isn't super likely to be needed.
|
414
|
+
end
|
415
|
+
end
|
416
|
+
end
|
417
|
+
end
|
418
|
+
end
|
419
|
+
|
420
|
+
action :add do
|
421
|
+
return unless debian?
|
422
|
+
|
423
|
+
execute "apt-cache gencaches" do
|
424
|
+
command %w{apt-cache gencaches}
|
425
|
+
default_env true
|
426
|
+
ignore_failure true
|
427
|
+
action :nothing
|
428
|
+
end
|
429
|
+
|
430
|
+
apt_update new_resource.name do
|
431
|
+
ignore_failure true
|
432
|
+
action :nothing
|
433
|
+
end
|
434
|
+
|
435
|
+
if new_resource.key.nil?
|
436
|
+
logger.debug "No 'key' property specified skipping key import"
|
437
|
+
else
|
438
|
+
new_resource.key.each do |k|
|
439
|
+
if is_key_id?(k) && !has_cookbook_file?(k)
|
440
|
+
install_key_from_keyserver(k)
|
441
|
+
else
|
442
|
+
install_key_from_uri(k)
|
443
|
+
end
|
444
|
+
end
|
445
|
+
end
|
446
|
+
|
447
|
+
cleanup_legacy_file!
|
448
|
+
|
449
|
+
repo = build_repo(
|
450
|
+
new_resource.uri,
|
451
|
+
new_resource.distribution,
|
452
|
+
repo_components,
|
453
|
+
new_resource.trusted,
|
454
|
+
new_resource.arch,
|
455
|
+
new_resource.deb_src
|
456
|
+
)
|
457
|
+
|
458
|
+
file "/etc/apt/sources.list.d/#{new_resource.repo_name}.list" do
|
459
|
+
owner "root"
|
460
|
+
group "root"
|
461
|
+
mode "0644"
|
462
|
+
content repo
|
463
|
+
sensitive new_resource.sensitive
|
464
|
+
action :create
|
465
|
+
notifies :run, "execute[apt-cache gencaches]", :immediately
|
466
|
+
notifies :update, "apt_update[#{new_resource.name}]", :immediately if new_resource.cache_rebuild
|
467
|
+
end
|
468
|
+
end
|
469
|
+
|
470
|
+
action :remove do
|
471
|
+
return unless debian?
|
472
|
+
|
473
|
+
cleanup_legacy_file!
|
474
|
+
if ::File.exist?("/etc/apt/sources.list.d/#{new_resource.repo_name}.list")
|
475
|
+
converge_by "Removing #{new_resource.repo_name} repository from /etc/apt/sources.list.d/" do
|
476
|
+
apt_update new_resource.name do
|
477
|
+
ignore_failure true
|
478
|
+
action :nothing
|
479
|
+
end
|
480
|
+
|
481
|
+
file "/etc/apt/sources.list.d/#{new_resource.repo_name}.list" do
|
482
|
+
sensitive new_resource.sensitive
|
483
|
+
action :delete
|
484
|
+
notifies :update, "apt_update[#{new_resource.name}]", :immediately if new_resource.cache_rebuild
|
485
|
+
end
|
486
|
+
end
|
487
|
+
else
|
488
|
+
logger.trace("/etc/apt/sources.list.d/#{new_resource.repo_name}.list does not exist. Nothing to do")
|
489
|
+
end
|
490
|
+
end
|
491
|
+
|
153
492
|
end
|
154
493
|
end
|
155
494
|
end
|