chef 16.1.16 → 16.18.30
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/Gemfile +32 -27
- data/README.md +5 -5
- data/Rakefile +35 -30
- data/bin/knife +1 -1
- data/chef-universal-mingw32.gemspec +5 -5
- data/chef.gemspec +32 -10
- data/lib/chef/action_collection.rb +5 -1
- data/lib/chef/api_client/registration.rb +2 -2
- data/lib/chef/application/apply.rb +19 -13
- data/lib/chef/application/base.rb +27 -24
- data/lib/chef/application/client.rb +17 -6
- data/lib/chef/application/exit_code.rb +13 -4
- data/lib/chef/application/knife.rb +22 -11
- data/lib/chef/application/solo.rb +2 -1
- data/lib/chef/application/windows_service.rb +39 -39
- data/lib/chef/application/windows_service_manager.rb +7 -7
- data/lib/chef/application.rb +33 -19
- data/lib/chef/{whitelist.rb → attribute_allowlist.rb} +11 -11
- data/lib/chef/{blacklist.rb → attribute_blocklist.rb} +9 -9
- data/lib/chef/chef_class.rb +0 -1
- data/lib/chef/chef_fs/chef_fs_data_store.rb +55 -55
- data/lib/chef/chef_fs/data_handler/cookbook_data_handler.rb +1 -1
- data/lib/chef/chef_fs/data_handler/data_bag_item_data_handler.rb +1 -1
- data/lib/chef/chef_fs/data_handler/organization_data_handler.rb +1 -2
- data/lib/chef/chef_fs/file_pattern.rb +1 -1
- data/lib/chef/chef_fs/file_system/chef_server/acl_entry.rb +10 -10
- data/lib/chef/chef_fs/file_system/chef_server/cookbook_file.rb +2 -2
- data/lib/chef/chef_fs/file_system/chef_server/cookbooks_dir.rb +1 -5
- data/lib/chef/chef_fs/file_system/chef_server/organization_invites_entry.rb +8 -8
- data/lib/chef/chef_fs/file_system/chef_server/organization_members_entry.rb +8 -8
- data/lib/chef/chef_fs/file_system/repository/base_file.rb +1 -0
- data/lib/chef/chef_fs/file_system/repository/chef_repository_file_system_cookbook_dir.rb +2 -2
- data/lib/chef/chef_fs/file_system/repository/chef_repository_file_system_cookbook_entry.rb +2 -2
- data/lib/chef/chef_fs/file_system/repository/chef_repository_file_system_root_dir.rb +18 -18
- data/lib/chef/chef_fs/file_system/repository/directory.rb +1 -1
- data/lib/chef/chef_fs/file_system/repository/file_system_entry.rb +1 -1
- data/lib/chef/chef_fs/knife.rb +2 -2
- data/lib/chef/chef_fs/parallelizer/parallel_enumerable.rb +1 -1
- data/lib/chef/chef_fs/parallelizer.rb +0 -1
- data/lib/chef/chef_fs/path_utils.rb +1 -1
- data/lib/chef/client.rb +32 -59
- data/lib/chef/compliance/default_attributes.rb +97 -0
- data/lib/chef/compliance/fetcher/automate.rb +80 -0
- data/lib/chef/compliance/fetcher/chef_server.rb +134 -0
- data/lib/chef/compliance/reporter/automate.rb +201 -0
- data/lib/chef/compliance/reporter/chef_server_automate.rb +94 -0
- data/lib/chef/compliance/reporter/compliance_enforcer.rb +20 -0
- data/lib/chef/compliance/reporter/json_file.rb +19 -0
- data/lib/chef/compliance/runner.rb +269 -0
- data/lib/chef/cookbook/chefignore.rb +1 -1
- data/lib/chef/cookbook/cookbook_version_loader.rb +1 -1
- data/lib/chef/cookbook/gem_installer.rb +6 -2
- data/lib/chef/cookbook/metadata.rb +1 -1
- data/lib/chef/cookbook/remote_file_vendor.rb +1 -3
- data/lib/chef/cookbook/synchronizer.rb +2 -2
- data/lib/chef/cookbook/syntax_check.rb +1 -2
- data/lib/chef/cookbook_loader.rb +15 -29
- data/lib/chef/cookbook_manifest.rb +2 -1
- data/lib/chef/cookbook_site_streaming_uploader.rb +13 -11
- data/lib/chef/cookbook_uploader.rb +1 -1
- data/lib/chef/cookbook_version.rb +30 -11
- data/lib/chef/data_bag.rb +5 -6
- data/lib/chef/data_collector/config_validation.rb +22 -13
- data/lib/chef/data_collector/run_end_message.rb +15 -5
- data/lib/chef/data_collector/run_start_message.rb +1 -1
- data/lib/chef/data_collector.rb +7 -6
- data/lib/chef/deprecated.rb +27 -5
- data/lib/chef/deprecation/warnings.rb +2 -2
- data/lib/chef/digester.rb +4 -3
- data/lib/chef/dsl/chef_vault.rb +1 -1
- data/lib/chef/dsl/data_query.rb +2 -2
- data/lib/chef/dsl/platform_introspection.rb +10 -8
- data/lib/chef/dsl/reboot_pending.rb +1 -1
- data/lib/chef/encrypted_data_bag_item/assertions.rb +1 -1
- data/lib/chef/encrypted_data_bag_item/decryptor.rb +3 -3
- data/lib/chef/encrypted_data_bag_item/encryptor.rb +3 -3
- data/lib/chef/encrypted_data_bag_item.rb +3 -4
- data/lib/chef/environment.rb +6 -7
- data/lib/chef/event_loggers/windows_eventlog.rb +2 -2
- data/lib/chef/exceptions.rb +16 -6
- data/lib/chef/file_access_control/windows.rb +12 -11
- data/lib/chef/file_access_control.rb +1 -1
- data/lib/chef/file_cache.rb +4 -4
- data/lib/chef/file_content_management/deploy/mv_unix.rb +1 -1
- data/lib/chef/file_content_management/tempfile.rb +10 -10
- data/lib/chef/formatters/doc.rb +7 -6
- data/lib/chef/formatters/error_inspectors/api_error_formatting.rb +6 -5
- data/lib/chef/formatters/error_inspectors/compile_error_inspector.rb +3 -3
- data/lib/chef/formatters/error_inspectors/node_load_error_inspector.rb +3 -3
- data/lib/chef/formatters/error_inspectors/registration_error_inspector.rb +9 -9
- data/lib/chef/formatters/error_inspectors/resource_failure_inspector.rb +8 -8
- data/lib/chef/formatters/error_inspectors/run_list_expansion_error_inspector.rb +3 -3
- data/lib/chef/formatters/error_mapper.rb +2 -2
- data/lib/chef/formatters/indentable_output_stream.rb +2 -2
- data/lib/chef/formatters/minimal.rb +5 -4
- data/lib/chef/guard_interpreter/resource_guard_interpreter.rb +28 -39
- data/lib/chef/handler/json_file.rb +1 -1
- data/lib/chef/handler.rb +2 -0
- data/lib/chef/http/auth_credentials.rb +5 -1
- data/lib/chef/http/authenticator.rb +4 -2
- data/lib/chef/http/basic_client.rb +4 -2
- data/lib/chef/http/decompressor.rb +1 -1
- data/lib/chef/http/http_request.rb +8 -6
- data/lib/chef/http/json_output.rb +1 -1
- data/lib/chef/http/socketless_chef_zero_client.rb +5 -2
- data/lib/chef/http/ssl_policies.rb +52 -15
- data/lib/chef/http.rb +38 -31
- data/lib/chef/json_compat.rb +4 -9
- data/lib/chef/key.rb +1 -1
- data/lib/chef/knife/bootstrap/chef_vault_handler.rb +1 -1
- data/lib/chef/knife/bootstrap/templates/chef-full.erb +12 -12
- data/lib/chef/knife/bootstrap/templates/windows-chef-client-msi.erb +9 -9
- data/lib/chef/knife/bootstrap/train_connector.rb +2 -1
- data/lib/chef/knife/bootstrap.rb +93 -40
- data/lib/chef/knife/client_bulk_delete.rb +1 -1
- data/lib/chef/knife/client_create.rb +3 -3
- data/lib/chef/knife/config_get.rb +8 -96
- data/lib/chef/knife/config_get_profile.rb +9 -9
- data/lib/chef/knife/config_list.rb +139 -0
- data/lib/chef/knife/config_list_profiles.rb +8 -95
- data/lib/chef/knife/config_show.rb +127 -0
- data/lib/chef/knife/config_use.rb +61 -0
- data/lib/chef/knife/config_use_profile.rb +12 -17
- data/lib/chef/knife/configure.rb +5 -3
- data/lib/chef/knife/cookbook_delete.rb +1 -1
- data/lib/chef/knife/cookbook_download.rb +1 -1
- data/lib/chef/knife/cookbook_metadata.rb +1 -1
- data/lib/chef/knife/cookbook_upload.rb +29 -37
- data/lib/chef/knife/core/bootstrap_context.rb +3 -3
- data/lib/chef/knife/core/cookbook_scm_repo.rb +2 -2
- data/lib/chef/knife/core/formatting_options.rb +49 -0
- data/lib/chef/knife/core/gem_glob_loader.rb +2 -2
- data/lib/chef/knife/core/generic_presenter.rb +1 -1
- data/lib/chef/knife/core/hashed_command_loader.rb +3 -2
- data/lib/chef/knife/core/node_presenter.rb +0 -25
- data/lib/chef/knife/core/object_loader.rb +1 -1
- data/lib/chef/knife/core/status_presenter.rb +1 -26
- data/lib/chef/knife/core/subcommand_loader.rb +20 -1
- data/lib/chef/knife/core/ui.rb +12 -3
- data/lib/chef/knife/core/windows_bootstrap_context.rb +51 -42
- data/lib/chef/knife/data_bag_create.rb +1 -1
- data/lib/chef/knife/delete.rb +15 -15
- data/lib/chef/knife/exec.rb +4 -4
- data/lib/chef/knife/node_bulk_delete.rb +1 -1
- data/lib/chef/knife/node_policy_set.rb +2 -2
- data/lib/chef/knife/node_run_list_add.rb +1 -1
- data/lib/chef/knife/node_run_list_remove.rb +2 -2
- data/lib/chef/knife/node_run_list_set.rb +1 -1
- data/lib/chef/knife/node_show.rb +4 -3
- data/lib/chef/knife/rehash.rb +3 -21
- data/lib/chef/knife/role_bulk_delete.rb +1 -1
- data/lib/chef/knife/role_env_run_list_add.rb +1 -1
- data/lib/chef/knife/role_env_run_list_set.rb +1 -1
- data/lib/chef/knife/role_run_list_add.rb +1 -1
- data/lib/chef/knife/role_run_list_set.rb +1 -1
- data/lib/chef/knife/search.rb +2 -2
- data/lib/chef/knife/serve.rb +3 -3
- data/lib/chef/knife/ssh.rb +33 -12
- data/lib/chef/knife/ssl_check.rb +3 -3
- data/lib/chef/knife/status.rb +10 -13
- data/lib/chef/knife/supermarket_share.rb +1 -1
- data/lib/chef/knife/supermarket_unshare.rb +1 -1
- data/lib/chef/knife/tag_create.rb +1 -1
- data/lib/chef/knife/tag_delete.rb +1 -1
- data/lib/chef/knife/user_create.rb +2 -2
- data/lib/chef/knife/xargs.rb +19 -19
- data/lib/chef/knife/yaml_convert.rb +1 -1
- data/lib/chef/knife.rb +9 -9
- data/lib/chef/local_mode.rb +2 -2
- data/lib/chef/log/syslog.rb +2 -2
- data/lib/chef/log/winevt.rb +2 -2
- data/lib/chef/log.rb +8 -3
- data/lib/chef/mixin/checksum.rb +5 -0
- data/{spec/functional/resource/base.rb → lib/chef/mixin/chef_utils_wiring.rb} +24 -12
- data/lib/chef/mixin/convert_to_class_name.rb +0 -56
- data/lib/chef/mixin/deep_merge.rb +35 -18
- data/{spec/unit/monkey_patches/uri_spec.rb → lib/chef/mixin/default_paths.rb} +11 -13
- data/lib/chef/mixin/openssl_helper.rb +32 -11
- data/lib/chef/mixin/path_sanity.rb +5 -4
- data/lib/chef/mixin/powershell_exec.rb +17 -22
- data/lib/chef/mixin/powershell_out.rb +12 -5
- data/lib/chef/mixin/properties.rb +2 -0
- data/lib/chef/mixin/securable.rb +2 -2
- data/lib/chef/mixin/shell_out.rb +4 -188
- data/lib/chef/mixin/template.rb +4 -3
- data/lib/chef/mixin/unformatter.rb +1 -1
- data/lib/chef/mixin/uris.rb +4 -2
- data/lib/chef/mixin/versioned_api.rb +1 -2
- data/lib/chef/mixin/which.rb +6 -3
- data/lib/chef/mixins.rb +1 -0
- data/lib/chef/monkey_patches/webrick-utils.rb +10 -10
- data/lib/chef/node/attribute.rb +22 -7
- data/lib/chef/node/attribute_collections.rb +2 -6
- data/lib/chef/node/mixin/deep_merge_cache.rb +4 -4
- data/lib/chef/node/mixin/immutablize_hash.rb +2 -0
- data/lib/chef/node.rb +43 -18
- data/lib/chef/node_map.rb +21 -18
- data/lib/chef/platform/query_helpers.rb +4 -4
- data/lib/chef/platform/service_helpers.rb +31 -28
- data/lib/chef/policy_builder/dynamic.rb +2 -0
- data/lib/chef/policy_builder/policyfile.rb +8 -3
- data/lib/chef/powershell.rb +10 -4
- data/lib/chef/property.rb +2 -2
- data/lib/chef/provider/batch.rb +3 -10
- data/lib/chef/provider/cron/unix.rb +0 -2
- data/lib/chef/provider/cron.rb +9 -28
- data/lib/chef/provider/dsc_resource.rb +12 -24
- data/lib/chef/provider/dsc_script.rb +16 -20
- data/lib/chef/provider/execute.rb +2 -1
- data/lib/chef/provider/file.rb +5 -5
- data/lib/chef/provider/git.rb +22 -14
- data/lib/chef/provider/group/dscl.rb +3 -3
- data/lib/chef/provider/group/suse.rb +5 -5
- data/lib/chef/provider/group/windows.rb +13 -2
- data/lib/chef/provider/group.rb +14 -8
- data/lib/chef/provider/ifconfig/debian.rb +38 -22
- data/lib/chef/provider/ifconfig/redhat.rb +54 -18
- data/lib/chef/provider/ifconfig.rb +16 -19
- data/lib/chef/provider/launchd.rb +3 -13
- data/lib/chef/provider/link.rb +0 -9
- data/lib/chef/provider/mount/aix.rb +1 -1
- data/lib/chef/provider/mount/linux.rb +67 -0
- data/lib/chef/provider/mount/mount.rb +41 -43
- data/lib/chef/provider/mount/solaris.rb +0 -1
- data/lib/chef/provider/mount/windows.rb +2 -2
- data/lib/chef/provider/mount.rb +23 -3
- data/lib/chef/provider/noop.rb +1 -1
- data/lib/chef/provider/package/apt.rb +1 -1
- data/lib/chef/provider/package/chocolatey.rb +6 -6
- data/lib/chef/provider/package/dnf/dnf_helper.py +23 -6
- data/lib/chef/provider/package/dnf/python_helper.rb +6 -6
- data/lib/chef/provider/package/dnf.rb +39 -12
- data/lib/chef/provider/package/dpkg.rb +3 -12
- data/lib/chef/provider/package/freebsd/base.rb +3 -2
- data/lib/chef/provider/package/freebsd/pkgng.rb +4 -2
- data/lib/chef/provider/package/homebrew.rb +1 -1
- data/lib/chef/provider/package/ips.rb +1 -1
- data/lib/chef/provider/package/openbsd.rb +1 -1
- data/lib/chef/provider/package/portage.rb +2 -2
- data/lib/chef/provider/package/powershell.rb +10 -2
- data/lib/chef/provider/package/rubygems.rb +25 -22
- data/lib/chef/provider/package/snap.rb +99 -34
- data/lib/chef/provider/package/solaris.rb +0 -2
- data/lib/chef/provider/package/windows/msi.rb +3 -3
- data/lib/chef/provider/package/windows/registry_uninstall_entry.rb +12 -10
- data/lib/chef/provider/package/windows.rb +12 -7
- data/lib/chef/provider/package/yum/rpm_utils.rb +1 -1
- data/lib/chef/provider/package/yum/yum_helper.py +4 -10
- data/lib/chef/provider/package/zypper.rb +99 -73
- data/lib/chef/provider/package.rb +53 -18
- data/lib/chef/provider/powershell_script.rb +40 -17
- data/lib/chef/provider/registry_key.rb +4 -3
- data/lib/chef/provider/remote_file/content.rb +3 -0
- data/lib/chef/provider/remote_file/ftp.rb +6 -4
- data/lib/chef/provider/remote_file/http.rb +4 -1
- data/lib/chef/provider/remote_file/sftp.rb +6 -4
- data/lib/chef/provider/route.rb +4 -8
- data/lib/chef/provider/script.rb +4 -75
- data/lib/chef/provider/service/arch.rb +2 -2
- data/lib/chef/provider/service/debian.rb +5 -4
- data/lib/chef/provider/service/gentoo.rb +2 -2
- data/lib/chef/provider/service/macosx.rb +7 -7
- data/lib/chef/provider/service/openbsd.rb +5 -8
- data/lib/chef/provider/service/redhat.rb +4 -4
- data/lib/chef/provider/service/upstart.rb +1 -1
- data/lib/chef/provider/service/windows.rb +11 -11
- data/lib/chef/provider/service.rb +2 -2
- data/lib/chef/provider/subversion.rb +2 -2
- data/lib/chef/provider/systemd_unit.rb +0 -2
- data/lib/chef/provider/template/content.rb +2 -1
- data/lib/chef/provider/template_finder.rb +2 -10
- data/lib/chef/provider/user/aix.rb +1 -1
- data/lib/chef/provider/user/dscl.rb +10 -10
- data/lib/chef/provider/user/linux.rb +3 -3
- data/lib/chef/provider/user/mac.rb +29 -21
- data/lib/chef/provider/user/solaris.rb +1 -1
- data/lib/chef/provider/user/windows.rb +10 -3
- data/lib/chef/provider/user.rb +17 -9
- data/lib/chef/provider/windows_script.rb +87 -25
- data/lib/chef/provider/yum_repository.rb +3 -3
- data/lib/chef/provider/zypper_repository.rb +33 -14
- data/lib/chef/provider.rb +1 -5
- data/lib/chef/provider_resolver.rb +1 -1
- data/lib/chef/providers.rb +1 -4
- data/lib/chef/pwsh.rb +71 -0
- data/lib/chef/recipe.rb +2 -2
- data/lib/chef/resource/alternatives.rb +1 -1
- data/lib/chef/resource/apt_package.rb +1 -1
- data/lib/chef/resource/apt_repository.rb +7 -15
- data/lib/chef/resource/archive_file.rb +28 -8
- data/lib/chef/resource/bash.rb +119 -2
- data/lib/chef/resource/batch.rb +5 -3
- data/lib/chef/resource/bff_package.rb +22 -0
- data/lib/chef/resource/breakpoint.rb +59 -2
- data/lib/chef/resource/build_essential.rb +7 -10
- data/lib/chef/resource/cab_package.rb +29 -0
- data/lib/chef/resource/chef_client_config.rb +313 -0
- data/lib/chef/resource/chef_client_cron.rb +36 -29
- data/lib/chef/resource/chef_client_launchd.rb +194 -0
- data/lib/chef/resource/chef_client_scheduled_task.rb +36 -21
- data/lib/chef/resource/chef_client_systemd_timer.rb +29 -22
- data/lib/chef/resource/chef_client_trusted_certificate.rb +102 -0
- data/lib/chef/resource/chef_gem.rb +58 -22
- data/lib/chef/resource/chef_handler.rb +149 -4
- data/lib/chef/resource/chef_sleep.rb +3 -3
- data/lib/chef/resource/chef_vault_secret.rb +14 -14
- data/lib/chef/resource/chocolatey_feature.rb +1 -2
- data/lib/chef/resource/cookbook_file.rb +2 -2
- data/lib/chef/resource/cron/_cron_shared.rb +99 -0
- data/lib/chef/resource/cron/cron.rb +46 -0
- data/lib/chef/resource/{cron_d.rb → cron/cron_d.rb} +9 -89
- data/lib/chef/resource/cron_access.rb +13 -5
- data/lib/chef/resource/csh.rb +2 -3
- data/lib/chef/resource/dmg_package.rb +2 -2
- data/lib/chef/resource/dnf_package.rb +2 -2
- data/lib/chef/resource/dsc_resource.rb +0 -1
- data/lib/chef/resource/dsc_script.rb +9 -2
- data/lib/chef/resource/execute.rb +486 -15
- data/lib/chef/resource/file.rb +5 -5
- data/lib/chef/resource/freebsd_package.rb +1 -1
- data/lib/chef/resource/gem_package.rb +36 -3
- data/lib/chef/resource/helpers/cron_validations.rb +6 -3
- data/lib/chef/resource/homebrew_cask.rb +16 -10
- data/lib/chef/resource/homebrew_package.rb +32 -3
- data/lib/chef/resource/homebrew_update.rb +110 -0
- data/lib/chef/resource/hostname.rb +27 -40
- data/lib/chef/resource/http_request.rb +1 -1
- data/lib/chef/resource/ifconfig.rb +52 -5
- data/lib/chef/resource/kernel_module.rb +15 -2
- data/lib/chef/resource/ksh.rb +3 -3
- data/lib/chef/resource/launchd.rb +18 -17
- data/lib/chef/resource/locale.rb +4 -4
- data/lib/chef/resource/lwrp_base.rb +4 -5
- data/lib/chef/resource/macos_userdefaults.rb +176 -61
- data/lib/chef/resource/mdadm.rb +2 -2
- data/lib/chef/resource/mount.rb +9 -3
- data/lib/chef/resource/notify_group.rb +0 -1
- data/lib/chef/resource/ohai.rb +46 -3
- data/lib/chef/resource/ohai_hint.rb +33 -0
- data/lib/chef/resource/openssl_dhparam.rb +29 -5
- data/lib/chef/resource/openssl_ec_private_key.rb +8 -3
- data/lib/chef/resource/openssl_ec_public_key.rb +4 -2
- data/lib/chef/resource/openssl_rsa_private_key.rb +8 -3
- data/lib/chef/resource/openssl_rsa_public_key.rb +2 -0
- data/lib/chef/resource/openssl_x509_certificate.rb +49 -49
- data/lib/chef/resource/openssl_x509_crl.rb +22 -12
- data/lib/chef/resource/openssl_x509_request.rb +37 -36
- data/lib/chef/resource/osx_profile.rb +292 -6
- data/lib/chef/resource/perl.rb +2 -3
- data/lib/chef/resource/plist.rb +26 -11
- data/lib/chef/resource/powershell_package_source.rb +25 -24
- data/lib/chef/resource/powershell_script.rb +40 -41
- data/lib/chef/resource/python.rb +2 -3
- data/lib/chef/resource/reboot.rb +2 -2
- data/lib/chef/resource/registry_key.rb +93 -2
- data/lib/chef/resource/remote_directory.rb +1 -1
- data/lib/chef/resource/remote_file.rb +26 -10
- data/lib/chef/resource/rhsm_register.rb +39 -10
- data/lib/chef/resource/rhsm_subscription.rb +5 -5
- data/lib/chef/resource/route.rb +1 -1
- data/lib/chef/resource/ruby.rb +1 -6
- data/lib/chef/resource/ruby_block.rb +2 -2
- data/lib/chef/resource/scm/_scm.rb +2 -1
- data/lib/chef/resource/scm/git.rb +82 -1
- data/lib/chef/resource/scm/subversion.rb +14 -2
- data/lib/chef/resource/script.rb +2 -2
- data/lib/chef/resource/service.rb +5 -5
- data/lib/chef/resource/solaris_package.rb +0 -2
- data/lib/chef/resource/ssh_known_hosts_entry.rb +18 -3
- data/lib/chef/resource/sudo.rb +32 -5
- data/lib/chef/resource/support/client.erb +68 -0
- data/lib/chef/resource/support/cron.d.erb +1 -1
- data/lib/chef/resource/support/cron_access.erb +1 -1
- data/lib/chef/resource/support/sudoer.erb +1 -1
- data/lib/chef/resource/support/ulimit.erb +1 -1
- data/lib/chef/resource/swap_file.rb +17 -0
- data/lib/chef/resource/sysctl.rb +6 -10
- data/lib/chef/resource/systemd_unit.rb +45 -4
- data/lib/chef/resource/template.rb +4 -4
- data/lib/chef/resource/timezone.rb +122 -68
- data/lib/chef/resource/user/windows_user.rb +5 -0
- data/lib/chef/resource/user_ulimit.rb +2 -1
- data/lib/chef/resource/windows_ad_join.rb +51 -13
- data/lib/chef/resource/windows_audit_policy.rb +232 -0
- data/lib/chef/resource/windows_auto_run.rb +13 -0
- data/lib/chef/resource/windows_certificate.rb +95 -39
- data/lib/chef/resource/windows_dfs_folder.rb +2 -0
- data/lib/chef/resource/windows_dfs_namespace.rb +2 -0
- data/lib/chef/resource/windows_dfs_server.rb +9 -4
- data/lib/chef/resource/windows_dns_record.rb +25 -5
- data/lib/chef/resource/windows_dns_zone.rb +12 -7
- data/lib/chef/resource/windows_env.rb +173 -0
- data/lib/chef/resource/windows_feature.rb +4 -0
- data/lib/chef/resource/windows_feature_dism.rb +10 -0
- data/lib/chef/resource/windows_feature_powershell.rb +14 -2
- data/lib/chef/resource/windows_firewall_profile.rb +196 -0
- data/lib/chef/resource/windows_firewall_rule.rb +14 -14
- data/lib/chef/resource/windows_font.rb +7 -5
- data/lib/chef/resource/windows_package.rb +30 -6
- data/lib/chef/resource/windows_pagefile.rb +5 -1
- data/lib/chef/resource/windows_path.rb +38 -0
- data/lib/chef/resource/windows_printer.rb +22 -21
- data/lib/chef/resource/windows_printer_port.rb +20 -17
- data/lib/chef/resource/windows_script.rb +2 -16
- data/lib/chef/resource/windows_security_policy.rb +98 -49
- data/lib/chef/resource/windows_service.rb +108 -0
- data/lib/chef/resource/windows_share.rb +23 -21
- data/lib/chef/resource/windows_shortcut.rb +3 -2
- data/lib/chef/resource/windows_task.rb +633 -32
- data/lib/chef/resource/windows_uac.rb +5 -1
- data/lib/chef/resource/windows_user_privilege.rb +111 -77
- data/lib/chef/resource/windows_workgroup.rb +11 -10
- data/lib/chef/resource/yum_package.rb +2 -2
- data/lib/chef/resource/yum_repository.rb +15 -10
- data/lib/chef/resource.rb +60 -27
- data/lib/chef/resource_collection/resource_set.rb +2 -6
- data/lib/chef/resource_collection/stepable_iterator.rb +1 -2
- data/lib/chef/resource_inspector.rb +82 -70
- data/lib/chef/resource_reporter.rb +1 -3
- data/lib/chef/resources.rb +9 -3
- data/lib/chef/role.rb +3 -4
- data/lib/chef/run_context/cookbook_compiler.rb +21 -21
- data/lib/chef/run_context.rb +2 -2
- data/lib/chef/run_lock.rb +3 -3
- data/lib/chef/run_status.rb +2 -6
- data/lib/chef/search/query.rb +7 -6
- data/lib/chef/server_api.rb +0 -4
- data/lib/chef/server_api_versions.rb +4 -0
- data/lib/chef/shell/ext.rb +15 -15
- data/lib/chef/shell/shell_session.rb +4 -2
- data/lib/chef/shell.rb +63 -27
- data/lib/chef/train_transport.rb +5 -104
- data/lib/chef/util/backup.rb +2 -2
- data/lib/chef/util/diff.rb +16 -17
- data/lib/chef/util/dsc/configuration_generator.rb +53 -12
- data/lib/chef/util/dsc/lcm_output_parser.rb +4 -7
- data/lib/chef/util/dsc/local_configuration_manager.rb +18 -15
- data/lib/chef/util/dsc/resource_store.rb +5 -11
- data/lib/chef/util/powershell/ps_credential.rb +18 -14
- data/lib/chef/util/threaded_job_queue.rb +0 -2
- data/lib/chef/util/windows/net_user.rb +1 -1
- data/lib/chef/util/windows/volume.rb +1 -1
- data/lib/chef/version.rb +2 -2
- data/lib/chef/version_string.rb +1 -1
- data/lib/chef/win32/api/file.rb +4 -0
- data/lib/chef/win32/api.rb +9 -2
- data/lib/chef/win32/crypto.rb +1 -1
- data/lib/chef/win32/file/version_info.rb +5 -5
- data/lib/chef/win32/file.rb +4 -4
- data/lib/chef/win32/registry.rb +4 -6
- data/lib/chef/win32/security/sid.rb +1 -1
- data/lib/chef/win32/security.rb +1 -1
- data/lib/chef/win32/unicode.rb +1 -1
- data/lib/chef/win32/version.rb +4 -2
- data/spec/data/lwrp/providers/buck_passer.rb +1 -1
- data/spec/data/lwrp/providers/buck_passer_2.rb +1 -1
- data/spec/data/lwrp/providers/embedded_resource_accesses_providers_scope.rb +1 -1
- data/spec/data/rubygems.org/latest_specs.4.8.gz +0 -0
- data/spec/data/rubygems.org/nonexistent_gem +0 -0
- data/spec/data/rubygems.org/sexp_processor +0 -0
- data/spec/data/rubygems.org/sexp_processor-4.15.1.gemspec.rz +0 -0
- data/spec/data/shef-config.rb +1 -1
- data/spec/data/ssl/binary/chef-rspec-der.cert +0 -0
- data/spec/data/ssl/binary/chef-rspec-der.key +0 -0
- data/spec/data/ssl/chef-rspec.cert +15 -15
- data/spec/functional/assets/yumrepo-empty/repodata/01a3b-filelists.sqlite.bz2 +0 -0
- data/spec/functional/assets/yumrepo-empty/repodata/401dc-filelists.xml.gz +0 -0
- data/spec/functional/assets/yumrepo-empty/repodata/5dc1e-primary.sqlite.bz2 +0 -0
- data/spec/functional/assets/yumrepo-empty/repodata/6bf96-other.xml.gz +0 -0
- data/spec/functional/assets/yumrepo-empty/repodata/7c365-other.sqlite.bz2 +0 -0
- data/spec/functional/assets/yumrepo-empty/repodata/dabe2-primary.xml.gz +0 -0
- data/spec/functional/assets/yumrepo-empty/repodata/repomd.xml +55 -0
- data/spec/functional/event_loggers/windows_eventlog_spec.rb +6 -5
- data/spec/functional/knife/configure_spec.rb +1 -1
- data/spec/functional/knife/ssh_spec.rb +5 -16
- data/spec/functional/mixin/powershell_out_spec.rb +11 -3
- data/spec/functional/resource/aix_service_spec.rb +11 -4
- data/spec/functional/resource/aixinit_service_spec.rb +9 -10
- data/spec/functional/resource/apt_package_spec.rb +4 -7
- data/spec/functional/resource/bash_spec.rb +3 -2
- data/spec/functional/resource/bff_spec.rb +3 -3
- data/spec/functional/resource/chocolatey_package_spec.rb +11 -3
- data/spec/functional/resource/cookbook_file_spec.rb +1 -1
- data/spec/functional/resource/cron_spec.rb +24 -6
- data/spec/functional/resource/dnf_package_spec.rb +323 -17
- data/spec/functional/resource/dsc_resource_spec.rb +1 -1
- data/spec/functional/resource/dsc_script_spec.rb +6 -10
- data/spec/functional/resource/execute_spec.rb +1 -1
- data/spec/functional/resource/git_spec.rb +23 -1
- data/spec/functional/resource/group_spec.rb +26 -10
- data/spec/functional/resource/ifconfig_spec.rb +9 -1
- data/spec/functional/resource/insserv_spec.rb +8 -8
- data/spec/functional/resource/link_spec.rb +30 -25
- data/spec/functional/resource/mount_spec.rb +19 -3
- data/spec/functional/resource/msu_package_spec.rb +9 -3
- data/spec/functional/resource/ohai_spec.rb +2 -10
- data/spec/functional/resource/powershell_package_source_spec.rb +107 -0
- data/spec/functional/resource/powershell_script_spec.rb +65 -22
- data/spec/functional/resource/remote_file_spec.rb +9 -15
- data/spec/functional/resource/rpm_spec.rb +3 -3
- data/spec/functional/resource/timezone_spec.rb +2 -0
- data/spec/functional/resource/user/dscl_spec.rb +1 -1
- data/spec/functional/resource/user/mac_user_spec.rb +1 -1
- data/spec/functional/resource/windows_certificate_spec.rb +206 -382
- data/spec/functional/resource/windows_firewall_rule_spec.rb +93 -0
- data/spec/functional/resource/windows_font_spec.rb +50 -0
- data/spec/functional/resource/windows_package_spec.rb +36 -11
- data/spec/functional/resource/windows_path_spec.rb +4 -0
- data/spec/functional/resource/windows_security_policy_spec.rb +0 -4
- data/spec/functional/resource/windows_service_spec.rb +4 -0
- data/spec/functional/resource/windows_share_spec.rb +103 -0
- data/spec/functional/resource/windows_task_spec.rb +27 -27
- data/spec/functional/resource/windows_user_privilege_spec.rb +1 -2
- data/spec/functional/resource/yum_package_spec.rb +16 -1
- data/spec/functional/resource/zypper_package_spec.rb +15 -1
- data/spec/functional/run_lock_spec.rb +26 -25
- data/spec/functional/shell_spec.rb +10 -6
- data/spec/functional/version_spec.rb +4 -4
- data/spec/functional/win32/crypto_spec.rb +1 -1
- data/spec/functional/win32/registry_spec.rb +8 -8
- data/spec/functional/win32/service_manager_spec.rb +1 -1
- data/spec/integration/client/client_spec.rb +6 -5
- data/spec/integration/client/exit_code_spec.rb +3 -2
- data/spec/integration/client/fips_spec.rb +21 -0
- data/spec/integration/client/ipv6_spec.rb +1 -1
- data/spec/integration/compliance/compliance_spec.rb +82 -0
- data/spec/integration/knife/client_key_create_spec.rb +1 -1
- data/spec/integration/knife/common_options_spec.rb +12 -12
- data/spec/integration/knife/config_list_spec.rb +220 -0
- data/spec/integration/knife/config_show_spec.rb +192 -0
- data/spec/integration/knife/config_use_spec.rb +198 -0
- data/spec/integration/knife/cookbook_api_ipv6_spec.rb +1 -1
- data/spec/integration/knife/cookbook_upload_spec.rb +28 -1
- data/spec/integration/knife/data_bag_from_file_spec.rb +1 -1
- data/spec/integration/knife/delete_spec.rb +1 -1
- data/spec/integration/knife/diff_spec.rb +3 -1
- data/spec/integration/knife/download_spec.rb +5 -3
- data/spec/integration/knife/environment_from_file_spec.rb +1 -1
- data/spec/integration/knife/node_create_spec.rb +1 -1
- data/spec/integration/knife/node_environment_set_spec.rb +1 -1
- data/spec/integration/knife/node_from_file_spec.rb +1 -1
- data/spec/integration/knife/node_run_list_add_spec.rb +4 -4
- data/spec/integration/knife/node_run_list_remove_spec.rb +1 -1
- data/spec/integration/knife/node_run_list_set_spec.rb +1 -1
- data/spec/integration/knife/node_show_spec.rb +1 -1
- data/spec/integration/knife/role_from_file_spec.rb +1 -1
- data/spec/integration/knife/serve_spec.rb +5 -5
- data/spec/integration/knife/upload_spec.rb +8 -7
- data/spec/integration/ohai/ohai_spec.rb +61 -0
- data/spec/integration/recipes/accumulator_spec.rb +1 -1
- data/spec/integration/recipes/lwrp_inline_resources_spec.rb +2 -2
- data/spec/integration/recipes/lwrp_spec.rb +1 -1
- data/spec/integration/recipes/notifies_spec.rb +2 -2
- data/spec/integration/recipes/notifying_block_spec.rb +1 -1
- data/spec/integration/recipes/provider_choice.rb +2 -2
- data/spec/integration/recipes/recipe_dsl_spec.rb +6 -1
- data/spec/integration/recipes/remote_directory.rb +1 -1
- data/spec/integration/recipes/resource_action_spec.rb +14 -0
- data/spec/integration/recipes/resource_converge_if_changed_spec.rb +2 -0
- data/spec/integration/recipes/resource_load_spec.rb +4 -2
- data/spec/integration/recipes/unified_mode_spec.rb +1 -1
- data/spec/integration/recipes/use_partial_spec.rb +1 -1
- data/spec/integration/solo/solo_spec.rb +5 -5
- data/spec/spec_helper.rb +30 -17
- data/spec/stress/win32/file_spec.rb +1 -1
- data/spec/support/chef_helpers.rb +3 -22
- data/spec/support/lib/chef/resource/cat.rb +1 -1
- data/spec/support/lib/chef/resource/one_two_three_four.rb +1 -1
- data/spec/support/matchers/leak.rb +2 -2
- data/spec/support/mock/platform.rb +24 -16
- data/spec/support/platform_helpers.rb +36 -41
- data/spec/support/platforms/win32/spec_service.rb +2 -2
- data/spec/support/shared/functional/directory_resource.rb +1 -1
- data/spec/support/shared/functional/execute_resource.rb +2 -2
- data/spec/support/shared/functional/file_resource.rb +20 -21
- data/spec/support/shared/functional/securable_resource.rb +109 -29
- data/spec/support/shared/functional/securable_resource_with_reporting.rb +0 -1
- data/spec/support/shared/functional/win32_service.rb +2 -2
- data/spec/support/shared/functional/windows_script.rb +5 -5
- data/spec/support/shared/integration/integration_helper.rb +22 -52
- data/spec/support/shared/integration/knife_support.rb +2 -9
- data/spec/support/shared/unit/application_dot_d.rb +5 -4
- data/spec/support/shared/unit/execute_resource.rb +1 -1
- data/spec/support/shared/unit/knife_shared.rb +1 -1
- data/spec/support/shared/unit/provider/file.rb +26 -8
- data/spec/support/shared/unit/script_resource.rb +10 -24
- data/spec/support/shared/unit/windows_script_resource.rb +16 -29
- data/spec/tiny_server.rb +0 -1
- data/spec/unit/application/client_spec.rb +2 -2
- data/spec/unit/application/exit_code_spec.rb +10 -0
- data/spec/unit/application/solo_spec.rb +4 -2
- data/spec/unit/application_spec.rb +15 -8
- data/spec/unit/chef_fs/config_spec.rb +3 -3
- data/spec/unit/chef_fs/data_handler/data_bag_item_data_handler.rb +1 -1
- data/spec/unit/chef_fs/diff_spec.rb +8 -8
- data/spec/unit/chef_fs/file_system/operation_failed_error_spec.rb +2 -4
- data/spec/unit/chef_fs/{parallelizer.rb → parallelizer_spec.rb} +6 -2
- data/spec/unit/chef_fs/path_util_spec.rb +1 -1
- data/spec/unit/client_spec.rb +25 -5
- data/spec/unit/compliance/fetcher/automate_spec.rb +142 -0
- data/spec/unit/compliance/fetcher/chef_server_spec.rb +93 -0
- data/spec/unit/compliance/reporter/automate_spec.rb +427 -0
- data/spec/unit/compliance/reporter/chef_server_automate_spec.rb +177 -0
- data/spec/unit/compliance/reporter/compliance_enforcer_spec.rb +48 -0
- data/spec/unit/compliance/runner_spec.rb +215 -0
- data/spec/unit/cookbook/gem_installer_spec.rb +2 -1
- data/spec/unit/cookbook/synchronizer_spec.rb +28 -26
- data/spec/unit/cookbook_spec.rb +2 -2
- data/spec/unit/cookbook_version_spec.rb +52 -0
- data/spec/unit/daemon_spec.rb +1 -5
- data/spec/unit/data_bag_spec.rb +6 -3
- data/spec/unit/data_collector/config_validation_spec.rb +208 -0
- data/spec/unit/data_collector_spec.rb +100 -120
- data/spec/unit/decorator_spec.rb +23 -23
- data/spec/unit/dsl/declare_resource_spec.rb +1 -1
- data/spec/unit/dsl/platform_introspection_spec.rb +1 -0
- data/spec/unit/dsl/reboot_pending_spec.rb +2 -2
- data/spec/unit/environment_spec.rb +12 -8
- data/spec/unit/event_dispatch/dispatcher_spec.rb +3 -0
- data/spec/unit/file_access_control_spec.rb +1 -1
- data/spec/unit/formatters/error_inspectors/resource_failure_inspector_spec.rb +2 -2
- data/spec/unit/guard_interpreter/resource_guard_interpreter_spec.rb +11 -11
- data/spec/unit/guard_interpreter_spec.rb +1 -1
- data/spec/unit/http/api_versions_spec.rb +20 -2
- data/spec/unit/http/ssl_policies_spec.rb +125 -66
- data/spec/unit/json_compat_spec.rb +1 -1
- data/spec/unit/knife/bootstrap_spec.rb +69 -45
- data/spec/unit/knife/client_create_spec.rb +2 -2
- data/spec/unit/knife/configure_client_spec.rb +5 -5
- data/spec/unit/knife/configure_spec.rb +3 -3
- data/spec/unit/knife/cookbook_delete_spec.rb +2 -2
- data/spec/unit/knife/cookbook_download_spec.rb +8 -8
- data/spec/unit/knife/cookbook_list_spec.rb +2 -2
- data/spec/unit/knife/cookbook_metadata_from_file_spec.rb +1 -1
- data/spec/unit/knife/cookbook_metadata_spec.rb +3 -3
- data/spec/unit/knife/cookbook_show_spec.rb +6 -7
- data/spec/unit/knife/cookbook_upload_spec.rb +7 -10
- data/spec/unit/knife/core/hashed_command_loader_spec.rb +3 -3
- data/spec/unit/knife/core/node_editor_spec.rb +1 -1
- data/spec/unit/knife/core/status_presenter_spec.rb +54 -0
- data/spec/unit/knife/core/ui_spec.rb +1 -0
- data/spec/unit/knife/core/windows_bootstrap_context_spec.rb +24 -15
- data/spec/unit/knife/data_bag_edit_spec.rb +1 -1
- data/spec/unit/knife/environment_compare_spec.rb +3 -3
- data/spec/unit/knife/ssh_spec.rb +2 -2
- data/spec/unit/knife/supermarket_download_spec.rb +8 -8
- data/spec/unit/knife/supermarket_list_spec.rb +3 -3
- data/spec/unit/knife/supermarket_search_spec.rb +1 -1
- data/spec/unit/knife/supermarket_share_spec.rb +6 -7
- data/spec/unit/knife/tag_create_spec.rb +1 -1
- data/spec/unit/knife/tag_delete_spec.rb +1 -1
- data/spec/unit/knife/user_create_spec.rb +1 -1
- data/spec/unit/log/syslog_spec.rb +6 -10
- data/spec/unit/log/winevt_spec.rb +21 -13
- data/spec/unit/lwrp_spec.rb +12 -9
- data/spec/unit/mixin/checksum_spec.rb +28 -0
- data/spec/unit/mixin/deep_merge_spec.rb +15 -0
- data/spec/unit/mixin/{path_sanity_spec.rb → default_paths_spec.rb} +14 -14
- data/spec/unit/mixin/openssl_helper_spec.rb +1 -8
- data/spec/unit/mixin/powershell_exec_spec.rb +43 -6
- data/spec/unit/mixin/powershell_out_spec.rb +16 -4
- data/spec/unit/mixin/powershell_type_coercions_spec.rb +1 -1
- data/spec/unit/mixin/securable_spec.rb +2 -3
- data/spec/unit/mixin/shell_out_spec.rb +25 -26
- data/spec/unit/mixin/subclass_directive_spec.rb +2 -2
- data/spec/unit/mixin/template_spec.rb +30 -30
- data/spec/unit/mixin/unformatter_spec.rb +2 -2
- data/spec/unit/mixin/uris_spec.rb +1 -1
- data/spec/unit/mixin/user_context_spec.rb +1 -9
- data/spec/unit/mixin/which.rb +9 -1
- data/spec/unit/mixin/windows_architecture_helper_spec.rb +4 -4
- data/spec/unit/node/immutable_collections_spec.rb +8 -4
- data/spec/unit/node_spec.rb +103 -16
- data/spec/unit/platform/query_helpers_spec.rb +13 -14
- data/spec/unit/policy_builder/policyfile_spec.rb +11 -1
- data/spec/unit/property_spec.rb +6 -6
- data/spec/unit/provider/batch_spec.rb +130 -0
- data/spec/unit/provider/cron/unix_spec.rb +1 -1
- data/spec/unit/provider/cron_spec.rb +43 -49
- data/spec/unit/provider/dsc_resource_spec.rb +30 -63
- data/spec/unit/provider/dsc_script_spec.rb +11 -11
- data/spec/unit/provider/execute_spec.rb +1 -8
- data/spec/unit/provider/git_spec.rb +3 -3
- data/spec/unit/provider/group/windows_spec.rb +6 -0
- data/spec/unit/provider/group_spec.rb +1 -1
- data/spec/unit/provider/ifconfig_spec.rb +0 -1
- data/spec/unit/provider/mdadm_spec.rb +1 -3
- data/spec/unit/provider/mount/linux_spec.rb +107 -0
- data/spec/unit/provider/mount/mount_spec.rb +73 -10
- data/spec/unit/provider/mount/solaris_spec.rb +1 -1
- data/spec/unit/provider/mount/windows_spec.rb +1 -0
- data/spec/unit/provider/mount_spec.rb +31 -0
- data/spec/unit/provider/package/chocolatey_spec.rb +2 -3
- data/spec/unit/provider/package/dnf/python_helper_spec.rb +8 -2
- data/spec/unit/provider/package/freebsd/pkgng_spec.rb +1 -1
- data/spec/unit/provider/package/openbsd_spec.rb +1 -1
- data/spec/unit/provider/package/pacman_spec.rb +17 -20
- data/spec/unit/provider/package/powershell_spec.rb +162 -99
- data/spec/unit/provider/package/rubygems_spec.rb +50 -20
- data/spec/unit/provider/package/smartos_spec.rb +1 -1
- data/spec/unit/provider/package/snap_spec.rb +1 -1
- data/spec/unit/provider/package/windows/registry_uninstall_entry_spec.rb +3 -3
- data/spec/unit/provider/package/windows_spec.rb +30 -53
- data/spec/unit/provider/package/zypper_spec.rb +0 -25
- data/spec/unit/provider/package_spec.rb +2 -2
- data/spec/unit/provider/powershell_script_spec.rb +20 -44
- data/spec/unit/provider/remote_directory_spec.rb +9 -9
- data/spec/unit/provider/route_spec.rb +0 -2
- data/spec/unit/provider/script_spec.rb +20 -110
- data/spec/unit/provider/service/arch_service_spec.rb +3 -2
- data/spec/unit/provider/service/debian_service_spec.rb +1 -1
- data/spec/unit/provider/service/gentoo_service_spec.rb +7 -7
- data/spec/unit/provider/service/macosx_spec.rb +6 -6
- data/spec/unit/provider/service/redhat_spec.rb +3 -3
- data/spec/unit/provider/service/upstart_service_spec.rb +3 -3
- data/spec/unit/provider/service/windows_spec.rb +2 -6
- data/spec/unit/provider/subversion_spec.rb +0 -3
- data/spec/unit/provider/systemd_unit_spec.rb +29 -25
- data/spec/unit/provider/user/dscl_spec.rb +2 -2
- data/spec/unit/provider/user_spec.rb +7 -1
- data/spec/unit/provider/windows_env_spec.rb +22 -37
- data/spec/unit/provider/windows_path_spec.rb +6 -11
- data/spec/unit/provider/windows_task_spec.rb +7 -6
- data/spec/unit/provider/zypper_repository_spec.rb +60 -10
- data/spec/unit/provider_spec.rb +1 -0
- data/spec/unit/recipe_spec.rb +1 -1
- data/spec/unit/resource/archive_file_spec.rb +23 -2
- data/spec/unit/resource/batch_spec.rb +6 -6
- data/spec/unit/resource/breakpoint_spec.rb +1 -1
- data/spec/unit/resource/build_essential_spec.rb +0 -12
- data/spec/unit/resource/chef_client_config_spec.rb +137 -0
- data/spec/unit/resource/chef_client_cron_spec.rb +51 -14
- data/spec/unit/resource/chef_client_launchd_spec.rb +127 -0
- data/spec/unit/resource/chef_client_scheduled_task_spec.rb +17 -7
- data/spec/unit/resource/chef_client_systemd_timer_spec.rb +43 -5
- data/spec/unit/resource/chef_client_trusted_certificate_spec.rb +68 -0
- data/spec/unit/resource/cron_spec.rb +2 -2
- data/spec/unit/resource/execute_spec.rb +123 -118
- data/spec/unit/resource/file/verification_spec.rb +2 -1
- data/spec/unit/resource/helpers/cron_validations_spec.rb +5 -1
- data/spec/unit/resource/homebrew_cask_spec.rb +29 -11
- data/spec/unit/resource/homebrew_update_spec.rb +30 -0
- data/spec/unit/resource/ifconfig_spec.rb +2 -10
- data/spec/unit/resource/launchd_spec.rb +8 -0
- data/spec/unit/resource/macos_user_defaults_spec.rb +103 -2
- data/spec/unit/resource/mount_spec.rb +28 -5
- data/spec/unit/resource/osx_profile_spec.rb +299 -0
- data/spec/unit/resource/powershell_package_source_spec.rb +20 -20
- data/spec/unit/resource/powershell_script_spec.rb +15 -108
- data/spec/unit/resource/rhsm_register_spec.rb +56 -18
- data/spec/unit/resource/rhsm_subscription_spec.rb +50 -3
- data/spec/unit/resource/script_spec.rb +6 -1
- data/spec/unit/resource/service_spec.rb +2 -2
- data/spec/unit/resource/solaris_package_spec.rb +8 -10
- data/spec/unit/resource/systemd_unit_spec.rb +1 -1
- data/spec/unit/resource/timezone_spec.rb +64 -1
- data/spec/unit/{log_spec.rb → resource/user/windows_user_spec.rb} +16 -4
- data/spec/unit/resource/user_ulimit_spec.rb +14 -1
- data/spec/unit/resource/windows_audit_policy_spec.rb +64 -0
- data/spec/unit/resource/windows_certificate_spec.rb +12 -0
- data/spec/unit/resource/windows_dns_record_spec.rb +3 -3
- data/spec/unit/resource/windows_dns_zone_spec.rb +2 -2
- data/spec/unit/resource/windows_feature_powershell_spec.rb +30 -4
- data/spec/unit/resource/windows_firewall_profile_spec.rb +77 -0
- data/spec/unit/resource/windows_package_spec.rb +1 -0
- data/spec/unit/resource/windows_task_spec.rb +1 -1
- data/spec/unit/resource/windows_uac_spec.rb +3 -3
- data/spec/unit/resource/windows_user_privilege_spec.rb +55 -0
- data/spec/unit/resource/yum_repository_spec.rb +21 -21
- data/spec/unit/resource_inspector_spec.rb +10 -5
- data/spec/unit/resource_reporter_spec.rb +1 -1
- data/spec/unit/resource_spec.rb +137 -3
- data/spec/unit/role_spec.rb +30 -28
- data/spec/unit/run_context/cookbook_compiler_spec.rb +1 -1
- data/spec/unit/run_lock_spec.rb +6 -2
- data/spec/unit/runner_spec.rb +1 -2
- data/spec/unit/scan_access_control_spec.rb +1 -1
- data/spec/unit/server_api_spec.rb +43 -16
- data/spec/unit/shell/shell_ext_spec.rb +46 -3
- data/spec/unit/shell/shell_session_spec.rb +35 -64
- data/spec/unit/shell_spec.rb +18 -21
- data/spec/unit/train_transport_spec.rb +14 -13
- data/spec/unit/util/backup_spec.rb +1 -1
- data/spec/unit/util/diff_spec.rb +1 -15
- data/spec/unit/util/dsc/configuration_generator_spec.rb +80 -1
- data/spec/unit/util/dsc/local_configuration_manager_spec.rb +27 -35
- data/spec/unit/util/powershell/ps_credential_spec.rb +2 -2
- data/spec/unit/util/selinux_spec.rb +4 -1
- data/spec/unit/util/threaded_job_queue_spec.rb +9 -0
- data/spec/unit/win32/security_spec.rb +4 -3
- data/tasks/rspec.rb +2 -4
- metadata +172 -104
- data/lib/chef/dist.rb +0 -68
- data/lib/chef/monkey_patches/net_http.rb +0 -22
- data/lib/chef/provider/osx_profile.rb +0 -255
- data/lib/chef/provider/windows_env.rb +0 -210
- data/lib/chef/provider/windows_path.rb +0 -61
- data/lib/chef/provider/windows_task.rb +0 -635
- data/lib/chef/resource/cron.rb +0 -157
- data/lib/chef/util/powershell/cmdlet.rb +0 -173
- data/lib/chef/util/powershell/cmdlet_result.rb +0 -61
- data/spec/data/trusted_certs_empty/.gitkeep +0 -0
- data/spec/data/trusted_certs_empty/README.md +0 -1
- data/spec/functional/assets/yumrepo/repodata/4632d67cb92636e7575d911c24f0e04d3505a944e97c483abe0c3e73a7c62d33-filelists.sqlite.bz2 +0 -0
- data/spec/functional/assets/yumrepo/repodata/74599b793e54d877323837d2d81a1c3c594c44e4335f9528234bb490f7b9b439-other.xml.gz +0 -0
- data/spec/functional/assets/yumrepo/repodata/a845d418f919d2115ab95a56b2c76f6825ad0d0bede49181a55c04f58995d057-primary.sqlite.bz2 +0 -0
- data/spec/functional/assets/yumrepo/repodata/af9b7cf9ef23bd7b43068d74a460f3b5d06753d638e58e4a0c9edc35bfb9cdc4-other.sqlite.bz2 +0 -0
- data/spec/functional/assets/yumrepo/repodata/bdb4f5f1492a3b9532f22c43110a81500dd744f23da0aec5c33b2a41317c737d-filelists.xml.gz +0 -0
- data/spec/functional/assets/yumrepo/repodata/c10d1d34ce99e02f12ec96ef68360543ab1bb7c3cb81a4a2bf78df7d8597e9df-primary.xml.gz +0 -0
- data/spec/functional/util/powershell/cmdlet_spec.rb +0 -111
- data/spec/integration/knife/config_get_profile_spec.rb +0 -113
- data/spec/integration/knife/config_get_spec.rb +0 -191
- data/spec/integration/knife/config_list_profiles_spec.rb +0 -190
- data/spec/integration/knife/config_use_profile_spec.rb +0 -101
- data/spec/scripts/ssl-serve.rb +0 -47
- data/spec/support/mock/constant.rb +0 -52
- data/spec/unit/provider/osx_profile_spec.rb +0 -255
- data/spec/unit/provider_resolver_spec.rb +0 -885
- data/spec/unit/resource/data/InstallHistory_with_CLT.plist +0 -92
- data/spec/unit/resource/data/InstallHistory_without_CLT.plist +0 -38
- data/spec/unit/util/powershell/cmdlet_spec.rb +0 -106
@@ -20,11 +20,13 @@ require_relative "../log"
|
|
20
20
|
require_relative "../config"
|
21
21
|
require_relative "../mixin/shell_out"
|
22
22
|
require_relative "../config_fetcher"
|
23
|
-
|
23
|
+
require "chef-utils/dist" unless defined?(ChefUtils::Dist)
|
24
24
|
require_relative "../daemon"
|
25
25
|
require "chef-config/mixin/dot_d"
|
26
26
|
require "license_acceptance/cli_flags/mixlib_cli"
|
27
|
-
|
27
|
+
module Mixlib
|
28
|
+
autoload :Archive, "mixlib/archive"
|
29
|
+
end
|
28
30
|
|
29
31
|
# This is a temporary class being used as a part of an effort to reduce duplication
|
30
32
|
# between Chef::Application::Client and Chef::Application::Solo.
|
@@ -55,7 +57,7 @@ class Chef::Application::Base < Chef::Application
|
|
55
57
|
|
56
58
|
option :once,
|
57
59
|
long: "--once",
|
58
|
-
description: "Cancel any interval or splay options, run #{
|
60
|
+
description: "Cancel any interval or splay options, run #{ChefUtils::Dist::Infra::PRODUCT} once and exit.",
|
59
61
|
boolean: true
|
60
62
|
|
61
63
|
option :formatter,
|
@@ -78,7 +80,7 @@ class Chef::Application::Base < Chef::Application
|
|
78
80
|
|
79
81
|
option :profile_ruby,
|
80
82
|
long: "--[no-]profile-ruby",
|
81
|
-
description: "Dump complete Ruby call graph stack of entire #{
|
83
|
+
description: "Dump complete Ruby call graph stack of entire #{ChefUtils::Dist::Infra::PRODUCT} run (expert only).",
|
82
84
|
boolean: true,
|
83
85
|
default: false
|
84
86
|
|
@@ -134,7 +136,7 @@ class Chef::Application::Base < Chef::Application
|
|
134
136
|
option :interval,
|
135
137
|
short: "-i SECONDS",
|
136
138
|
long: "--interval SECONDS",
|
137
|
-
description: "Run #{
|
139
|
+
description: "Run #{ChefUtils::Dist::Infra::PRODUCT} periodically, in seconds.",
|
138
140
|
proc: lambda { |s| s.to_i }
|
139
141
|
|
140
142
|
option :json_attribs,
|
@@ -158,12 +160,12 @@ class Chef::Application::Base < Chef::Application
|
|
158
160
|
option :environment,
|
159
161
|
short: "-E ENVIRONMENT",
|
160
162
|
long: "--environment ENVIRONMENT",
|
161
|
-
description: "Set the #{
|
163
|
+
description: "Set the #{ChefUtils::Dist::Infra::PRODUCT} environment on the node."
|
162
164
|
|
163
165
|
option :client_fork,
|
164
166
|
short: "-f",
|
165
167
|
long: "--[no-]fork",
|
166
|
-
description: "Fork #{
|
168
|
+
description: "Fork #{ChefUtils::Dist::Infra::PRODUCT} process."
|
167
169
|
|
168
170
|
option :why_run,
|
169
171
|
short: "-W",
|
@@ -190,14 +192,14 @@ class Chef::Application::Base < Chef::Application
|
|
190
192
|
option :version,
|
191
193
|
short: "-v",
|
192
194
|
long: "--version",
|
193
|
-
description: "Show #{
|
195
|
+
description: "Show #{ChefUtils::Dist::Infra::PRODUCT} version.",
|
194
196
|
boolean: true,
|
195
|
-
proc: lambda { |v| puts "#{
|
197
|
+
proc: lambda { |v| puts "#{ChefUtils::Dist::Infra::PRODUCT}: #{::Chef::VERSION}" },
|
196
198
|
exit: 0
|
197
199
|
|
198
200
|
option :minimal_ohai,
|
199
201
|
long: "--minimal-ohai",
|
200
|
-
description: "Only run the bare minimum Ohai plugins #{
|
202
|
+
description: "Only run the bare minimum Ohai plugins #{ChefUtils::Dist::Infra::PRODUCT} needs to function.",
|
201
203
|
boolean: true
|
202
204
|
|
203
205
|
option :delete_entire_chef_repo,
|
@@ -213,7 +215,7 @@ class Chef::Application::Base < Chef::Application
|
|
213
215
|
option :target,
|
214
216
|
short: "-t TARGET",
|
215
217
|
long: "--target TARGET",
|
216
|
-
description: "Target #{
|
218
|
+
description: "Target #{ChefUtils::Dist::Infra::PRODUCT} against a remote system or device",
|
217
219
|
proc: lambda { |target|
|
218
220
|
Chef::Log.warn "-- EXPERIMENTAL -- Target mode activated, resources and dsl may change without warning -- EXPERIMENTAL --"
|
219
221
|
target
|
@@ -228,7 +230,7 @@ class Chef::Application::Base < Chef::Application
|
|
228
230
|
option :fatal_windows_admin_check,
|
229
231
|
short: "-A",
|
230
232
|
long: "--fatal-windows-admin-check",
|
231
|
-
description: "Fail the run when #{
|
233
|
+
description: "Fail the run when #{ChefUtils::Dist::Infra::CLIENT} doesn't have administrator privileges on Windows.",
|
232
234
|
boolean: true
|
233
235
|
end
|
234
236
|
|
@@ -245,7 +247,7 @@ class Chef::Application::Base < Chef::Application
|
|
245
247
|
option :chef_server_url,
|
246
248
|
short: "-S CHEFSERVERURL",
|
247
249
|
long: "--server CHEFSERVERURL",
|
248
|
-
description: "The #{
|
250
|
+
description: "The #{ChefUtils::Dist::Server::PRODUCT} URL.",
|
249
251
|
proc: nil
|
250
252
|
|
251
253
|
option :validation_key,
|
@@ -263,7 +265,7 @@ class Chef::Application::Base < Chef::Application
|
|
263
265
|
option :enable_reporting,
|
264
266
|
short: "-R",
|
265
267
|
long: "--enable-reporting",
|
266
|
-
description: "(#{
|
268
|
+
description: "(#{ChefUtils::Dist::Infra::CLIENT} only) reporting data collection for runs.",
|
267
269
|
boolean: true
|
268
270
|
|
269
271
|
option :local_mode,
|
@@ -274,11 +276,11 @@ class Chef::Application::Base < Chef::Application
|
|
274
276
|
|
275
277
|
option :chef_zero_host,
|
276
278
|
long: "--chef-zero-host HOST",
|
277
|
-
description: "Host to start #{
|
279
|
+
description: "Host to start #{ChefUtils::Dist::Zero::PRODUCT} on."
|
278
280
|
|
279
281
|
option :chef_zero_port,
|
280
282
|
long: "--chef-zero-port PORT",
|
281
|
-
description: "Port (or port range) to start #{
|
283
|
+
description: "Port (or port range) to start #{ChefUtils::Dist::Zero::PRODUCT} on. Port ranges like 1000,1010 or 8889-9999 will try all given ports until one works."
|
282
284
|
|
283
285
|
option :listen,
|
284
286
|
long: "--[no-]listen",
|
@@ -287,7 +289,7 @@ class Chef::Application::Base < Chef::Application
|
|
287
289
|
|
288
290
|
option :skip_cookbook_sync,
|
289
291
|
long: "--[no-]skip-cookbook-sync",
|
290
|
-
description: "(#{
|
292
|
+
description: "(#{ChefUtils::Dist::Infra::CLIENT} only) Use cached cookbooks without overwriting local differences from the #{ChefUtils::Dist::Server::PRODUCT}.",
|
291
293
|
boolean: false
|
292
294
|
|
293
295
|
option :named_run_list,
|
@@ -326,7 +328,7 @@ class Chef::Application::Base < Chef::Application
|
|
326
328
|
# Run the chef client, optionally daemonizing or looping at intervals.
|
327
329
|
def run_application
|
328
330
|
if Chef::Config[:version]
|
329
|
-
puts "#{
|
331
|
+
puts "#{ChefUtils::Dist::Infra::PRODUCT} version: #{::Chef::VERSION}"
|
330
332
|
end
|
331
333
|
|
332
334
|
if !Chef::Config[:client_fork] || Chef::Config[:once]
|
@@ -346,24 +348,25 @@ class Chef::Application::Base < Chef::Application
|
|
346
348
|
private
|
347
349
|
|
348
350
|
def windows_interval_error_message
|
349
|
-
"Windows #{
|
351
|
+
"Windows #{ChefUtils::Dist::Infra::PRODUCT} interval runs are not supported in #{ChefUtils::Dist::Infra::PRODUCT} 15 and later." +
|
350
352
|
"\nConfiguration settings:" +
|
351
353
|
("\n interval = #{Chef::Config[:interval]} seconds" if Chef::Config[:interval]).to_s +
|
352
|
-
"\nPlease manage #{
|
354
|
+
"\nPlease manage #{ChefUtils::Dist::Infra::PRODUCT} as a scheduled task instead."
|
353
355
|
end
|
354
356
|
|
355
357
|
def unforked_interval_error_message
|
356
|
-
"Unforked #{
|
358
|
+
"Unforked #{ChefUtils::Dist::Infra::PRODUCT} interval runs are disabled by default." +
|
357
359
|
"\nConfiguration settings:" +
|
358
360
|
("\n interval = #{Chef::Config[:interval]} seconds" if Chef::Config[:interval]).to_s +
|
359
|
-
"\nEnable #{
|
361
|
+
"\nEnable #{ChefUtils::Dist::Infra::PRODUCT} interval runs by setting `:client_fork = true` in your config file or adding `--fork` to your command line options."
|
360
362
|
end
|
361
363
|
|
362
364
|
def fetch_recipe_tarball(url, path)
|
365
|
+
require "open-uri" unless defined?(OpenURI)
|
363
366
|
Chef::Log.trace("Download recipes tarball from #{url} to #{path}")
|
364
367
|
if File.exist?(url)
|
365
368
|
FileUtils.cp(url, path)
|
366
|
-
elsif
|
369
|
+
elsif URI::DEFAULT_PARSER.make_regexp.match?(url)
|
367
370
|
File.open(path, "wb") do |f|
|
368
371
|
open(url) do |r|
|
369
372
|
f.write(r.read)
|
@@ -377,7 +380,7 @@ class Chef::Application::Base < Chef::Application
|
|
377
380
|
|
378
381
|
def interval_run_chef_client
|
379
382
|
if Chef::Config[:daemonize]
|
380
|
-
Chef::Daemon.daemonize(
|
383
|
+
Chef::Daemon.daemonize(ChefUtils::Dist::Infra::PRODUCT)
|
381
384
|
|
382
385
|
# Start first daemonized run after configured number of seconds
|
383
386
|
if Chef::Config[:daemonize].is_a?(Integer)
|
@@ -20,7 +20,14 @@
|
|
20
20
|
require_relative "base"
|
21
21
|
require_relative "../handler/error_report"
|
22
22
|
require_relative "../workstation_config_loader"
|
23
|
-
|
23
|
+
autoload :URI, "uri"
|
24
|
+
require "chef-utils" unless defined?(ChefUtils::CANARY)
|
25
|
+
module Mixlib
|
26
|
+
module Authentication
|
27
|
+
autoload :Log, "mixlib/authentication"
|
28
|
+
end
|
29
|
+
end
|
30
|
+
autoload :Train, "train"
|
24
31
|
|
25
32
|
# DO NOT MAKE EDITS, see Chef::Application::Base
|
26
33
|
#
|
@@ -39,13 +46,13 @@ class Chef::Application::Client < Chef::Application::Base
|
|
39
46
|
long: "--daemonize [WAIT]",
|
40
47
|
description: "Daemonize the process. Accepts an optional integer which is the " \
|
41
48
|
"number of seconds to wait before the first daemonized run.",
|
42
|
-
proc: lambda { |wait|
|
49
|
+
proc: lambda { |wait| /^\d+$/.match?(wait) ? wait.to_i : true }
|
43
50
|
end
|
44
51
|
|
45
52
|
option :pid_file,
|
46
53
|
short: "-P PID_FILE",
|
47
54
|
long: "--pid PIDFILE",
|
48
|
-
description: "Set the PID file location, for the #{
|
55
|
+
description: "Set the PID file location, for the #{ChefUtils::Dist::Infra::CLIENT} daemon process. Defaults to /tmp/chef-client.pid.",
|
49
56
|
proc: nil
|
50
57
|
|
51
58
|
option :runlist,
|
@@ -100,7 +107,7 @@ class Chef::Application::Client < Chef::Application::Base
|
|
100
107
|
tarball_path = File.join(Chef::Config.chef_repo_path, "recipes.tgz")
|
101
108
|
fetch_recipe_tarball(Chef::Config[:recipe_url], tarball_path)
|
102
109
|
Mixlib::Archive.new(tarball_path).extract(Chef::Config.chef_repo_path, perms: false, ignore: /^\.$/)
|
103
|
-
config_path = File.join(Chef::Config.chef_repo_path, "#{
|
110
|
+
config_path = File.join(Chef::Config.chef_repo_path, "#{ChefUtils::Dist::Infra::USER_CONF_DIR}/config.rb")
|
104
111
|
Chef::Config.from_string(IO.read(config_path), config_path) if File.file?(config_path)
|
105
112
|
end
|
106
113
|
end
|
@@ -109,8 +116,12 @@ class Chef::Application::Client < Chef::Application::Base
|
|
109
116
|
Chef::Config.chef_zero.port = config[:chef_zero_port] if config[:chef_zero_port]
|
110
117
|
|
111
118
|
if config[:target] || Chef::Config.target
|
112
|
-
Chef::Config.target_mode.enabled = true
|
113
119
|
Chef::Config.target_mode.host = config[:target] || Chef::Config.target
|
120
|
+
if URI.parse(Chef::Config.target_mode.host).scheme
|
121
|
+
train_config = Train.unpack_target_from_uri(Chef::Config.target_mode.host)
|
122
|
+
Chef::Config.target_mode = train_config
|
123
|
+
end
|
124
|
+
Chef::Config.target_mode.enabled = true
|
114
125
|
Chef::Config.node_name = Chef::Config.target_mode.host unless Chef::Config.node_name
|
115
126
|
end
|
116
127
|
|
@@ -147,7 +158,7 @@ class Chef::Application::Client < Chef::Application::Base
|
|
147
158
|
if config[:local_mode]
|
148
159
|
config[:config_file] = Chef::WorkstationConfigLoader.new(nil, Chef::Log).config_location
|
149
160
|
else
|
150
|
-
config[:config_file] = Chef::Config.platform_specific_path("#{
|
161
|
+
config[:config_file] = Chef::Config.platform_specific_path("#{ChefConfig::Config.etc_chef_dir}/client.rb")
|
151
162
|
end
|
152
163
|
end
|
153
164
|
|
@@ -22,7 +22,7 @@ class Chef
|
|
22
22
|
# These are the exit codes defined in Chef RFC 062
|
23
23
|
# https://github.com/chef/chef-rfc/blob/master/rfc062-exit-status.md
|
24
24
|
class ExitCode
|
25
|
-
|
25
|
+
require "chef-utils/dist" unless defined?(ChefUtils::Dist)
|
26
26
|
|
27
27
|
# -1 is defined as DEPRECATED_FAILURE in RFC 062, so it is
|
28
28
|
# not enumerated in an active constant.
|
@@ -36,6 +36,7 @@ class Chef
|
|
36
36
|
REBOOT_NEEDED: 37,
|
37
37
|
REBOOT_FAILED: 41,
|
38
38
|
# 42 was used by audit mode and should not be reused
|
39
|
+
CONFIG_FAILURE: 43,
|
39
40
|
CLIENT_UPGRADED: 213,
|
40
41
|
}.freeze
|
41
42
|
|
@@ -79,6 +80,8 @@ class Chef
|
|
79
80
|
VALID_RFC_062_EXIT_CODES[:REBOOT_NEEDED]
|
80
81
|
elsif reboot_failed?(exception)
|
81
82
|
VALID_RFC_062_EXIT_CODES[:REBOOT_FAILED]
|
83
|
+
elsif configuration_failure?(exception)
|
84
|
+
VALID_RFC_062_EXIT_CODES[:CONFIG_FAILURE]
|
82
85
|
elsif client_upgraded?(exception)
|
83
86
|
VALID_RFC_062_EXIT_CODES[:CLIENT_UPGRADED]
|
84
87
|
else
|
@@ -104,6 +107,12 @@ class Chef
|
|
104
107
|
end
|
105
108
|
end
|
106
109
|
|
110
|
+
def configuration_failure?(exception)
|
111
|
+
resolve_exception_array(exception).any? do |e|
|
112
|
+
e.is_a? Chef::Exceptions::ConfigurationError
|
113
|
+
end
|
114
|
+
end
|
115
|
+
|
107
116
|
def client_upgraded?(exception)
|
108
117
|
resolve_exception_array(exception).any? do |e|
|
109
118
|
e.is_a? Chef::Exceptions::ClientUpgraded
|
@@ -144,9 +153,9 @@ class Chef
|
|
144
153
|
end
|
145
154
|
|
146
155
|
def non_standard_exit_code_warning(exit_code)
|
147
|
-
"#{
|
148
|
-
" The #{
|
149
|
-
" defines the exit codes that should be used with #{
|
156
|
+
"#{ChefUtils::Dist::Infra::CLIENT} attempted to exit with a non-standard exit code of #{exit_code}." \
|
157
|
+
" The #{ChefUtils::Dist::Infra::PRODUCT} Exit Codes design document (https://github.com/chef/chef-rfc/blob/master/rfc062-exit-status.md)" \
|
158
|
+
" defines the exit codes that should be used with #{ChefUtils::Dist::Infra::CLIENT}. Chef::Application::ExitCode defines" \
|
150
159
|
" valid exit codes Non-standard exit codes are redefined as GENERIC_FAILURE."
|
151
160
|
end
|
152
161
|
|
@@ -19,8 +19,10 @@ require_relative "../knife"
|
|
19
19
|
require_relative "../application"
|
20
20
|
require "mixlib/log"
|
21
21
|
require "ohai/config"
|
22
|
-
|
23
|
-
|
22
|
+
module Net
|
23
|
+
autoload :HTTP, "net/http"
|
24
|
+
end
|
25
|
+
require "chef-utils/dist" unless defined?(ChefUtils::Dist)
|
24
26
|
|
25
27
|
class Chef::Application::Knife < Chef::Application
|
26
28
|
|
@@ -59,7 +61,7 @@ class Chef::Application::Knife < Chef::Application
|
|
59
61
|
option :environment,
|
60
62
|
short: "-E ENVIRONMENT",
|
61
63
|
long: "--environment ENVIRONMENT",
|
62
|
-
description: "Set the #{
|
64
|
+
description: "Set the #{ChefUtils::Dist::Infra::PRODUCT} environment (except for in searches, where this will be flagrantly ignored)."
|
63
65
|
|
64
66
|
option :editor,
|
65
67
|
short: "-e EDITOR",
|
@@ -84,18 +86,18 @@ class Chef::Application::Knife < Chef::Application
|
|
84
86
|
option :node_name,
|
85
87
|
short: "-u USER",
|
86
88
|
long: "--user USER",
|
87
|
-
description: "#{
|
89
|
+
description: "#{ChefUtils::Dist::Server::PRODUCT} API client username."
|
88
90
|
|
89
91
|
option :client_key,
|
90
92
|
short: "-k KEY",
|
91
93
|
long: "--key KEY",
|
92
|
-
description: "#{
|
94
|
+
description: "#{ChefUtils::Dist::Server::PRODUCT} API client key.",
|
93
95
|
proc: lambda { |path| File.expand_path(path, Dir.pwd) }
|
94
96
|
|
95
97
|
option :chef_server_url,
|
96
98
|
short: "-s URL",
|
97
99
|
long: "--server-url URL",
|
98
|
-
description: "#{
|
100
|
+
description: "#{ChefUtils::Dist::Server::PRODUCT} URL."
|
99
101
|
|
100
102
|
option :yes,
|
101
103
|
short: "-y",
|
@@ -120,16 +122,16 @@ class Chef::Application::Knife < Chef::Application
|
|
120
122
|
option :local_mode,
|
121
123
|
short: "-z",
|
122
124
|
long: "--local-mode",
|
123
|
-
description: "Point knife commands at local repository instead of #{
|
125
|
+
description: "Point knife commands at local repository instead of #{ChefUtils::Dist::Server::PRODUCT}.",
|
124
126
|
boolean: true
|
125
127
|
|
126
128
|
option :chef_zero_host,
|
127
129
|
long: "--chef-zero-host HOST",
|
128
|
-
description: "Host to start #{
|
130
|
+
description: "Host to start #{ChefUtils::Dist::Zero::PRODUCT} on."
|
129
131
|
|
130
132
|
option :chef_zero_port,
|
131
133
|
long: "--chef-zero-port PORT",
|
132
|
-
description: "Port (or port range) to start #{
|
134
|
+
description: "Port (or port range) to start #{ChefUtils::Dist::Zero::PRODUCT} on. Port ranges like 1000,1010 or 8889-9999 will try all given ports until one works."
|
133
135
|
|
134
136
|
option :listen,
|
135
137
|
long: "--[no-]listen",
|
@@ -139,9 +141,9 @@ class Chef::Application::Knife < Chef::Application
|
|
139
141
|
option :version,
|
140
142
|
short: "-v",
|
141
143
|
long: "--version",
|
142
|
-
description: "Show #{
|
144
|
+
description: "Show #{ChefUtils::Dist::Infra::PRODUCT} version.",
|
143
145
|
boolean: true,
|
144
|
-
proc: lambda { |v| puts "#{
|
146
|
+
proc: lambda { |v| puts "#{ChefUtils::Dist::Infra::PRODUCT}: #{::Chef::VERSION}" },
|
145
147
|
exit: 0
|
146
148
|
|
147
149
|
option :fips,
|
@@ -214,6 +216,15 @@ class Chef::Application::Knife < Chef::Application
|
|
214
216
|
rescue OptionParser::InvalidOption => e
|
215
217
|
puts "#{e}\n"
|
216
218
|
end
|
219
|
+
|
220
|
+
if want_help?
|
221
|
+
puts "#{ChefUtils::Dist::Infra::PRODUCT}: #{Chef::VERSION}"
|
222
|
+
puts
|
223
|
+
puts "Docs: #{ChefUtils::Dist::Org::KNIFE_DOCS}"
|
224
|
+
puts "Patents: #{ChefUtils::Dist::Org::PATENTS}"
|
225
|
+
puts
|
226
|
+
end
|
227
|
+
|
217
228
|
puts opt_parser
|
218
229
|
puts
|
219
230
|
Chef::Knife.list_commands
|
@@ -21,6 +21,7 @@ require_relative "../../chef"
|
|
21
21
|
require_relative "client"
|
22
22
|
require "fileutils" unless defined?(FileUtils)
|
23
23
|
require "pathname" unless defined?(Pathname)
|
24
|
+
require "chef-utils" unless defined?(ChefUtils::CANARY)
|
24
25
|
|
25
26
|
# DO NOT MAKE EDITS, see Chef::Application::Base
|
26
27
|
#
|
@@ -33,7 +34,7 @@ class Chef::Application::Solo < Chef::Application::Base
|
|
33
34
|
option :config_file,
|
34
35
|
short: "-c CONFIG",
|
35
36
|
long: "--config CONFIG",
|
36
|
-
default: Chef::Config.platform_specific_path("#{
|
37
|
+
default: Chef::Config.platform_specific_path("#{ChefConfig::Config.etc_chef_dir}/solo.rb"),
|
37
38
|
description: "The configuration file to use."
|
38
39
|
|
39
40
|
unless ChefUtils.windows?
|
@@ -29,7 +29,7 @@ require "socket" unless defined?(Socket)
|
|
29
29
|
require "uri" unless defined?(URI)
|
30
30
|
require "win32/daemon"
|
31
31
|
require_relative "../mixin/shell_out"
|
32
|
-
|
32
|
+
require "chef-utils/dist" unless defined?(ChefUtils::Dist)
|
33
33
|
|
34
34
|
class Chef
|
35
35
|
class Application
|
@@ -41,7 +41,7 @@ class Chef
|
|
41
41
|
short: "-c CONFIG",
|
42
42
|
long: "--config CONFIG",
|
43
43
|
default: "#{Chef::Config.etc_chef_dir}/client.rb",
|
44
|
-
description: "The configuration file to use for #{
|
44
|
+
description: "The configuration file to use for #{ChefUtils::Dist::Infra::PRODUCT} runs."
|
45
45
|
|
46
46
|
option :log_location,
|
47
47
|
short: "-L LOGLOCATION",
|
@@ -57,7 +57,7 @@ class Chef
|
|
57
57
|
option :interval,
|
58
58
|
short: "-i SECONDS",
|
59
59
|
long: "--interval SECONDS",
|
60
|
-
description: "Set the number of seconds to wait between #{
|
60
|
+
description: "Set the number of seconds to wait between #{ChefUtils::Dist::Infra::PRODUCT} runs.",
|
61
61
|
proc: lambda { |s| s.to_i }
|
62
62
|
|
63
63
|
DEFAULT_LOG_LOCATION ||= "#{Chef::Config.c_chef_dir}/client.log".freeze
|
@@ -67,7 +67,7 @@ class Chef
|
|
67
67
|
@service_signal = ConditionVariable.new
|
68
68
|
|
69
69
|
reconfigure
|
70
|
-
Chef::Log.info("#{
|
70
|
+
Chef::Log.info("#{ChefUtils::Dist::Infra::CLIENT} Service initialized")
|
71
71
|
end
|
72
72
|
|
73
73
|
def service_main(*startup_parameters)
|
@@ -78,33 +78,33 @@ class Chef
|
|
78
78
|
while running?
|
79
79
|
# Grab the service_action_mutex to make a chef-client run
|
80
80
|
@service_action_mutex.synchronize do
|
81
|
-
|
82
|
-
|
83
|
-
|
84
|
-
|
85
|
-
|
86
|
-
|
87
|
-
|
88
|
-
|
89
|
-
|
90
|
-
|
91
|
-
|
92
|
-
|
93
|
-
|
94
|
-
|
95
|
-
|
96
|
-
|
97
|
-
|
98
|
-
|
99
|
-
|
100
|
-
|
101
|
-
|
102
|
-
|
103
|
-
|
104
|
-
|
105
|
-
|
106
|
-
|
107
|
-
|
81
|
+
|
82
|
+
Chef::Log.info("Next #{ChefUtils::Dist::Infra::CLIENT} run will happen in #{timeout} seconds")
|
83
|
+
@service_signal.wait(@service_action_mutex, timeout)
|
84
|
+
|
85
|
+
# Continue only if service is RUNNING
|
86
|
+
next if state != RUNNING
|
87
|
+
|
88
|
+
# Reconfigure each time through to pick up any changes in the client file
|
89
|
+
Chef::Log.info("Reconfiguring with startup parameters")
|
90
|
+
reconfigure(startup_parameters)
|
91
|
+
timeout = Chef::Config[:interval]
|
92
|
+
|
93
|
+
# Honor splay sleep config
|
94
|
+
timeout += rand Chef::Config[:splay]
|
95
|
+
|
96
|
+
# run chef-client only if service is in RUNNING state
|
97
|
+
next if state != RUNNING
|
98
|
+
|
99
|
+
Chef::Log.info("#{ChefUtils::Dist::Infra::CLIENT} service is starting a #{ChefUtils::Dist::Infra::CLIENT} run...")
|
100
|
+
run_chef_client
|
101
|
+
rescue SystemExit => e
|
102
|
+
# Do not raise any of the errors here in order to
|
103
|
+
# prevent service crash
|
104
|
+
Chef::Log.error("#{e.class}: #{e}")
|
105
|
+
rescue Exception => e
|
106
|
+
Chef::Log.error("#{e.class}: #{e}")
|
107
|
+
|
108
108
|
end
|
109
109
|
end
|
110
110
|
|
@@ -131,12 +131,12 @@ class Chef
|
|
131
131
|
break
|
132
132
|
else
|
133
133
|
unless run_warning_displayed
|
134
|
-
Chef::Log.info("Currently a #{
|
134
|
+
Chef::Log.info("Currently a #{ChefUtils::Dist::Infra::PRODUCT} run is happening on this system.")
|
135
135
|
Chef::Log.info("Service will stop when run is completed.")
|
136
136
|
run_warning_displayed = true
|
137
137
|
end
|
138
138
|
|
139
|
-
Chef::Log.trace("Waiting for #{
|
139
|
+
Chef::Log.trace("Waiting for #{ChefUtils::Dist::Infra::PRODUCT} run...")
|
140
140
|
sleep 1
|
141
141
|
end
|
142
142
|
end
|
@@ -150,7 +150,7 @@ class Chef
|
|
150
150
|
# since this is a PAUSE signal.
|
151
151
|
|
152
152
|
if @service_action_mutex.locked?
|
153
|
-
Chef::Log.info("Currently a #{
|
153
|
+
Chef::Log.info("Currently a #{ChefUtils::Dist::Infra::PRODUCT} run is happening.")
|
154
154
|
Chef::Log.info("Service will pause once it's completed.")
|
155
155
|
else
|
156
156
|
Chef::Log.info("Service is pausing....")
|
@@ -185,7 +185,7 @@ class Chef
|
|
185
185
|
# The log_location and config_file of the parent process is passed to the new chef-client process.
|
186
186
|
# We need to add the --no-fork, as by default it is set to fork=true.
|
187
187
|
|
188
|
-
Chef::Log.info "Starting #{
|
188
|
+
Chef::Log.info "Starting #{ChefUtils::Dist::Infra::CLIENT} in a new process"
|
189
189
|
# Pass config params to the new process
|
190
190
|
config_params = " --no-fork"
|
191
191
|
config_params += " -c #{Chef::Config[:config_file]}" unless Chef::Config[:config_file].nil?
|
@@ -197,20 +197,20 @@ class Chef
|
|
197
197
|
# Starts a new process and waits till the process exits
|
198
198
|
|
199
199
|
result = shell_out(
|
200
|
-
"#{
|
200
|
+
"#{ChefUtils::Dist::Infra::CLIENT}.bat #{config_params}",
|
201
201
|
timeout: Chef::Config[:windows_service][:watchdog_timeout],
|
202
202
|
logger: Chef::Log
|
203
203
|
)
|
204
204
|
Chef::Log.trace (result.stdout).to_s
|
205
205
|
Chef::Log.trace (result.stderr).to_s
|
206
206
|
rescue Mixlib::ShellOut::CommandTimeout => e
|
207
|
-
Chef::Log.error "#{
|
207
|
+
Chef::Log.error "#{ChefUtils::Dist::Infra::CLIENT} timed out\n(#{e})"
|
208
208
|
Chef::Log.error(<<-EOF)
|
209
|
-
Your #{
|
209
|
+
Your #{ChefUtils::Dist::Infra::CLIENT} run timed out. You can increase the time #{ChefUtils::Dist::Infra::CLIENT} is given
|
210
210
|
to complete by configuring windows_service.watchdog_timeout in your client.rb.
|
211
211
|
EOF
|
212
212
|
rescue Mixlib::ShellOut::ShellCommandFailed => e
|
213
|
-
Chef::Log.warn "Not able to start #{
|
213
|
+
Chef::Log.warn "Not able to start #{ChefUtils::Dist::Infra::CLIENT} in new process (#{e})"
|
214
214
|
rescue => e
|
215
215
|
Chef::Log.error e
|
216
216
|
ensure
|
@@ -16,12 +16,12 @@
|
|
16
16
|
# limitations under the License.
|
17
17
|
#
|
18
18
|
|
19
|
-
if RUBY_PLATFORM
|
19
|
+
if RUBY_PLATFORM.match?(/mswin|mingw32|windows/)
|
20
20
|
require "win32/service"
|
21
21
|
end
|
22
22
|
require_relative "../config"
|
23
23
|
require "mixlib/cli" unless defined?(Mixlib::CLI)
|
24
|
-
|
24
|
+
require "chef-utils/dist" unless defined?(ChefUtils::Dist)
|
25
25
|
|
26
26
|
class Chef
|
27
27
|
class Application
|
@@ -41,18 +41,18 @@ class Chef
|
|
41
41
|
short: "-a ACTION",
|
42
42
|
long: "--action ACTION",
|
43
43
|
default: "status",
|
44
|
-
description: "Action to carry out on #{
|
44
|
+
description: "Action to carry out on #{ChefUtils::Dist::Infra::SHORT}-service (install, uninstall, status, start, stop, pause, or resume)."
|
45
45
|
|
46
46
|
option :config_file,
|
47
47
|
short: "-c CONFIG",
|
48
48
|
long: "--config CONFIG",
|
49
49
|
default: "#{ChefConfig::Config.c_chef_dir}/client.rb",
|
50
|
-
description: "The configuration file to use for #{
|
50
|
+
description: "The configuration file to use for #{ChefUtils::Dist::Infra::PRODUCT} runs."
|
51
51
|
|
52
52
|
option :log_location,
|
53
53
|
short: "-L LOGLOCATION",
|
54
54
|
long: "--logfile LOGLOCATION",
|
55
|
-
description: "Set the log file location for #{
|
55
|
+
description: "Set the log file location for #{ChefUtils::Dist::Infra::SHORT}-service."
|
56
56
|
|
57
57
|
option :help,
|
58
58
|
short: "-h",
|
@@ -66,9 +66,9 @@ class Chef
|
|
66
66
|
option :version,
|
67
67
|
short: "-v",
|
68
68
|
long: "--version",
|
69
|
-
description: "Show #{
|
69
|
+
description: "Show #{ChefUtils::Dist::Infra::PRODUCT} version.",
|
70
70
|
boolean: true,
|
71
|
-
proc: lambda { |v| puts "#{
|
71
|
+
proc: lambda { |v| puts "#{ChefUtils::Dist::Infra::PRODUCT}: #{::Chef::VERSION}" },
|
72
72
|
exit: 0
|
73
73
|
|
74
74
|
def initialize(service_options)
|