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
data/lib/chef/shell.rb
CHANGED
@@ -15,17 +15,23 @@
|
|
15
15
|
# limitations under the License.
|
16
16
|
#
|
17
17
|
|
18
|
+
module Mixlib
|
19
|
+
module Authentication
|
20
|
+
autoload :Log, "mixlib/authentication"
|
21
|
+
end
|
22
|
+
end
|
18
23
|
require "singleton" unless defined?(Singleton)
|
19
24
|
require "pp" unless defined?(PP)
|
20
25
|
require "etc" unless defined?(Etc)
|
21
26
|
require "mixlib/cli" unless defined?(Mixlib::CLI)
|
27
|
+
require "chef-utils/dist" unless defined?(ChefUtils::Dist)
|
28
|
+
require "chef-config/mixin/dot_d"
|
22
29
|
|
23
30
|
require_relative "../chef"
|
24
31
|
require_relative "version"
|
25
32
|
require_relative "client"
|
26
33
|
require_relative "config"
|
27
34
|
require_relative "config_fetcher"
|
28
|
-
require_relative "dist"
|
29
35
|
|
30
36
|
require_relative "shell/shell_session"
|
31
37
|
require_relative "workstation_config_loader"
|
@@ -126,11 +132,11 @@ module Shell
|
|
126
132
|
irb_conf[:IRB_RC] = lambda do |conf|
|
127
133
|
m = conf.main
|
128
134
|
|
129
|
-
conf.prompt_c = "#{
|
135
|
+
conf.prompt_c = "#{ChefUtils::Dist::Infra::EXEC}#{leader(m)} > "
|
130
136
|
conf.return_format = " => %s \n"
|
131
|
-
conf.prompt_i = "#{
|
132
|
-
conf.prompt_n = "#{
|
133
|
-
conf.prompt_s = "#{
|
137
|
+
conf.prompt_i = "#{ChefUtils::Dist::Infra::EXEC}#{leader(m)} (#{Chef::VERSION})> "
|
138
|
+
conf.prompt_n = "#{ChefUtils::Dist::Infra::EXEC}#{leader(m)} ?> "
|
139
|
+
conf.prompt_s = "#{ChefUtils::Dist::Infra::EXEC}#{leader(m)}%l> "
|
134
140
|
conf.use_tracer = false
|
135
141
|
conf.instance_variable_set(:@use_multiline, false)
|
136
142
|
conf.instance_variable_set(:@use_singleline, false)
|
@@ -206,23 +212,24 @@ module Shell
|
|
206
212
|
|
207
213
|
class Options
|
208
214
|
include Mixlib::CLI
|
215
|
+
include ChefConfig::Mixin::DotD
|
209
216
|
|
210
217
|
def self.footer(text = nil)
|
211
218
|
@footer = text if text
|
212
219
|
@footer
|
213
220
|
end
|
214
221
|
|
215
|
-
banner("#{
|
222
|
+
banner("#{ChefUtils::Dist::Infra::SHELL} #{Chef::VERSION}\n\nUsage: #{ChefUtils::Dist::Infra::SHELL} [NAMED_CONF] (OPTIONS)")
|
216
223
|
|
217
224
|
footer(<<~FOOTER)
|
218
|
-
When no CONFIG is specified, #{
|
219
|
-
* If a NAMED_CONF is given, #{
|
220
|
-
* If no NAMED_CONF is given #{
|
221
|
-
* If no #{
|
222
|
-
#{
|
223
|
-
#{
|
224
|
-
#{
|
225
|
-
#{
|
225
|
+
When no CONFIG is specified, #{ChefUtils::Dist::Infra::SHELL} attempts to load a default configuration file:
|
226
|
+
* If a NAMED_CONF is given, #{ChefUtils::Dist::Infra::SHELL} will load ~/#{ChefUtils::Dist::Infra::USER_CONF_DIR}/NAMED_CONF/#{ChefUtils::Dist::Infra::SHELL_CONF}
|
227
|
+
* If no NAMED_CONF is given #{ChefUtils::Dist::Infra::SHELL} will load ~/#{ChefUtils::Dist::Infra::USER_CONF_DIR}/#{ChefUtils::Dist::Infra::SHELL_CONF} if it exists
|
228
|
+
* If no #{ChefUtils::Dist::Infra::SHELL_CONF} can be found, #{ChefUtils::Dist::Infra::SHELL} falls back to load:
|
229
|
+
#{ChefConfig::Config.etc_chef_dir}/client.rb if -z option is given.
|
230
|
+
#{ChefConfig::Config.etc_chef_dir}/solo.rb if --solo-legacy-mode option is given.
|
231
|
+
#{ChefUtils::Dist::Infra::USER_CONF_DIR}/config.rb if -s option is given.
|
232
|
+
#{ChefUtils::Dist::Infra::USER_CONF_DIR}/knife.rb if -s option is given.
|
226
233
|
FOOTER
|
227
234
|
|
228
235
|
option :use_multiline,
|
@@ -269,19 +276,19 @@ module Shell
|
|
269
276
|
option :solo_shell,
|
270
277
|
short: "-s",
|
271
278
|
long: "--solo",
|
272
|
-
description: "#{
|
279
|
+
description: "#{ChefUtils::Dist::Solo::PRODUCT} session",
|
273
280
|
boolean: true,
|
274
281
|
proc: proc { Chef::Config[:solo] = true }
|
275
282
|
|
276
283
|
option :client,
|
277
284
|
short: "-z",
|
278
285
|
long: "--client",
|
279
|
-
description: "#{
|
286
|
+
description: "#{ChefUtils::Dist::Infra::PRODUCT} session",
|
280
287
|
boolean: true
|
281
288
|
|
282
289
|
option :solo_legacy_shell,
|
283
290
|
long: "--solo-legacy-mode",
|
284
|
-
description: "#{
|
291
|
+
description: "#{ChefUtils::Dist::Solo::PRODUCT} legacy session",
|
285
292
|
boolean: true,
|
286
293
|
proc: proc { Chef::Config[:solo_legacy_mode] = true }
|
287
294
|
|
@@ -294,15 +301,15 @@ module Shell
|
|
294
301
|
option :chef_server_url,
|
295
302
|
short: "-S CHEFSERVERURL",
|
296
303
|
long: "--server CHEFSERVERURL",
|
297
|
-
description: "The #{
|
304
|
+
description: "The #{ChefUtils::Dist::Server::PRODUCT} URL",
|
298
305
|
proc: nil
|
299
306
|
|
300
307
|
option :version,
|
301
308
|
short: "-v",
|
302
309
|
long: "--version",
|
303
|
-
description: "Show #{
|
310
|
+
description: "Show #{ChefUtils::Dist::Infra::PRODUCT} version",
|
304
311
|
boolean: true,
|
305
|
-
proc: lambda { |v| puts "#{
|
312
|
+
proc: lambda { |v| puts "#{ChefUtils::Dist::Infra::PRODUCT}: #{::Chef::VERSION}" },
|
306
313
|
exit: 0
|
307
314
|
|
308
315
|
option :override_runlist,
|
@@ -336,33 +343,62 @@ module Shell
|
|
336
343
|
# We have to nuke ARGV to make sure irb's option parser never sees it.
|
337
344
|
# otherwise, IRB complains about command line switches it doesn't recognize.
|
338
345
|
ARGV.clear
|
346
|
+
|
347
|
+
# This code should not exist.
|
348
|
+
# We should be using Application::Client and then calling load_config_file
|
349
|
+
# which does all this properly. However this will do for now.
|
339
350
|
config[:config_file] = config_file_for_shell_mode(environment)
|
340
351
|
config_msg = config[:config_file] || "none (standalone session)"
|
341
352
|
puts "loading configuration: #{config_msg}"
|
342
|
-
|
353
|
+
|
354
|
+
# load the config (if we have one)
|
355
|
+
unless config[:config_file].nil?
|
356
|
+
if File.exist?(config[:config_file]) && File.readable?(config[:config_file])
|
357
|
+
Chef::Config.from_file(config[:config_file])
|
358
|
+
end
|
359
|
+
|
360
|
+
# even if we couldn't load that, we need to tell Chef::Config what
|
361
|
+
# the file was so it sets conf dir and d_dir and such properly
|
362
|
+
Chef::Config[:config_file] = config[:config_file]
|
363
|
+
|
364
|
+
# now attempt to load any relevant dot-dirs
|
365
|
+
load_dot_d(Chef::Config[:client_d_dir]) if Chef::Config[:client_d_dir]
|
366
|
+
end
|
367
|
+
|
368
|
+
# finally merge command-line options in
|
343
369
|
Chef::Config.merge!(config)
|
344
370
|
end
|
345
371
|
|
346
372
|
private
|
347
373
|
|
374
|
+
# shamelessly lifted from application.rb
|
375
|
+
def apply_config(config_content, config_file_path)
|
376
|
+
Chef::Config.from_string(config_content, config_file_path)
|
377
|
+
rescue Exception => error
|
378
|
+
logger.fatal("Configuration error #{error.class}: #{error.message}")
|
379
|
+
filtered_trace = error.backtrace.grep(/#{Regexp.escape(config_file_path)}/)
|
380
|
+
filtered_trace.each { |line| logger.fatal(" " + line ) }
|
381
|
+
raise Chef::Exceptions::ConfigurationError.new("Aborting due to error in '#{config_file_path}': #{error}")
|
382
|
+
end
|
383
|
+
|
348
384
|
def config_file_for_shell_mode(environment)
|
349
385
|
dot_chef_dir = Chef::Util::PathHelper.home(".chef")
|
350
386
|
if config[:config_file]
|
351
387
|
config[:config_file]
|
352
388
|
elsif environment
|
353
389
|
Shell.env = environment
|
354
|
-
config_file_to_try = ::File.join(dot_chef_dir, environment,
|
390
|
+
config_file_to_try = ::File.join(dot_chef_dir, environment, ChefUtils::Dist::Infra::SHELL_CONF)
|
355
391
|
unless ::File.exist?(config_file_to_try)
|
356
|
-
puts "could not find #{
|
392
|
+
puts "could not find #{ChefUtils::Dist::Infra::SHELL} config for environment #{environment} at #{config_file_to_try}"
|
357
393
|
exit 1
|
358
394
|
end
|
359
395
|
config_file_to_try
|
360
|
-
elsif dot_chef_dir && ::File.exist?(File.join(dot_chef_dir,
|
361
|
-
File.join(dot_chef_dir,
|
396
|
+
elsif dot_chef_dir && ::File.exist?(File.join(dot_chef_dir, ChefUtils::Dist::Infra::SHELL_CONF))
|
397
|
+
File.join(dot_chef_dir, ChefUtils::Dist::Infra::SHELL_CONF)
|
362
398
|
elsif config[:solo_legacy_shell]
|
363
|
-
Chef::Config.platform_specific_path("#{
|
399
|
+
Chef::Config.platform_specific_path("#{ChefConfig::Config.etc_chef_dir}/solo.rb")
|
364
400
|
elsif config[:client]
|
365
|
-
Chef::Config.platform_specific_path("#{
|
401
|
+
Chef::Config.platform_specific_path("#{ChefConfig::Config.etc_chef_dir}/client.rb")
|
366
402
|
elsif config[:solo_shell]
|
367
403
|
Chef::WorkstationConfigLoader.new(nil, Chef::Log).config_location
|
368
404
|
else
|
data/lib/chef/train_transport.rb
CHANGED
@@ -15,114 +15,15 @@
|
|
15
15
|
# limitations under the License.
|
16
16
|
#
|
17
17
|
|
18
|
-
require "chef-config/mixin/
|
19
|
-
require "train"
|
20
|
-
require_relative "dist"
|
18
|
+
require "chef-config/mixin/train_transport" unless defined?(ChefConfig::Mixin::TrainTransport)
|
21
19
|
|
22
20
|
class Chef
|
23
21
|
class TrainTransport
|
24
|
-
|
22
|
+
include ChefConfig::Mixin::TrainTransport
|
25
23
|
|
26
|
-
|
27
|
-
|
28
|
-
|
29
|
-
def self.load_credentials(profile)
|
30
|
-
# Tomlrb.load_file returns a hash with keys as strings
|
31
|
-
credentials = parse_credentials_file
|
32
|
-
if contains_split_fqdn?(credentials, profile)
|
33
|
-
Chef::Log.warn("Credentials file #{credentials_file_path} contains target '#{profile}' as a Hash, expected a string.")
|
34
|
-
Chef::Log.warn("Hostnames must be surrounded by single quotes, e.g. ['host.example.org']")
|
35
|
-
end
|
36
|
-
|
37
|
-
# host names must be specified in credentials file as ['foo.example.org'] with quotes
|
38
|
-
if !credentials.nil? && !credentials[profile].nil?
|
39
|
-
credentials[profile].map { |k, v| [k.to_sym, v] }.to_h # return symbolized keys to match Train.options()
|
40
|
-
else
|
41
|
-
nil
|
42
|
-
end
|
43
|
-
end
|
44
|
-
|
45
|
-
# Toml creates hashes when a key is separated by periods, e.g.
|
46
|
-
# [host.example.org] => { host: { example: { org: {} } } }
|
47
|
-
#
|
48
|
-
# Returns true if the above example is true
|
49
|
-
#
|
50
|
-
# A hostname has to be specified as ['host.example.org']
|
51
|
-
# This will be a common mistake so we should catch it
|
52
|
-
#
|
53
|
-
def self.contains_split_fqdn?(hash, fqdn)
|
54
|
-
fqdn.split(".").reduce(hash) do |h, k|
|
55
|
-
v = h[k]
|
56
|
-
if Hash === v
|
57
|
-
v
|
58
|
-
else
|
59
|
-
break false
|
60
|
-
end
|
61
|
-
end
|
62
|
-
end
|
63
|
-
|
64
|
-
# ChefConfig::Mixin::Credentials.credentials_file_path is designed around knife,
|
65
|
-
# overriding it here.
|
66
|
-
#
|
67
|
-
# Credentials file preference:
|
68
|
-
#
|
69
|
-
# 1) target_mode.credentials_file
|
70
|
-
# 2) /etc/chef/TARGET_MODE_HOST/credentials
|
71
|
-
# 3) #credentials_file_path from parent ($HOME/.chef/credentials)
|
72
|
-
#
|
73
|
-
def self.credentials_file_path
|
74
|
-
tm_config = Chef::Config.target_mode
|
75
|
-
profile = tm_config.host
|
76
|
-
|
77
|
-
credentials_file =
|
78
|
-
if tm_config.credentials_file && File.exist?(tm_config.credentials_file)
|
79
|
-
tm_config.credentials_file
|
80
|
-
elsif File.exist?(Chef::Config.platform_specific_path("#{Chef::Dist::CONF_DIR}/#{profile}/credentials"))
|
81
|
-
Chef::Config.platform_specific_path("#{Chef::Dist::CONF_DIR}/#{profile}/credentials")
|
82
|
-
else
|
83
|
-
super
|
84
|
-
end
|
85
|
-
|
86
|
-
raise ArgumentError, "No credentials file found for target '#{profile}'" unless credentials_file
|
87
|
-
raise ArgumentError, "Credentials file specified for target mode does not exist: '#{credentials_file}'" unless File.exist?(credentials_file)
|
88
|
-
|
89
|
-
Chef::Log.debug("Loading credentials file '#{credentials_file}' for target '#{profile}'")
|
90
|
-
|
91
|
-
credentials_file
|
92
|
-
end
|
93
|
-
|
94
|
-
def self.build_transport(logger = Chef::Log.with_child(subsystem: "transport"))
|
95
|
-
return nil unless Chef::Config.target_mode?
|
96
|
-
|
97
|
-
# TODO: Consider supporting parsing the protocol from a URI passed to `--target`
|
98
|
-
#
|
99
|
-
train_config = {}
|
100
|
-
|
101
|
-
# Load the target_mode config context from Chef::Config, and place any valid settings into the train configuration
|
102
|
-
tm_config = Chef::Config.target_mode
|
103
|
-
protocol = tm_config.protocol
|
104
|
-
train_config = tm_config.to_hash.select { |k| Train.options(protocol).key?(k) }
|
105
|
-
Chef::Log.trace("Using target mode options from #{Chef::Dist::PRODUCT} config file: #{train_config.keys.join(", ")}") if train_config
|
106
|
-
|
107
|
-
# Load the credentials file, and place any valid settings into the train configuration
|
108
|
-
credentials = load_credentials(tm_config.host)
|
109
|
-
if credentials
|
110
|
-
valid_settings = credentials.select { |k| Train.options(protocol).key?(k) }
|
111
|
-
valid_settings[:enable_password] = credentials[:enable_password] if credentials.key?(:enable_password)
|
112
|
-
train_config.merge!(valid_settings)
|
113
|
-
Chef::Log.trace("Using target mode options from credentials file: #{valid_settings.keys.join(", ")}") if valid_settings
|
114
|
-
end
|
115
|
-
|
116
|
-
train_config[:logger] = logger
|
117
|
-
|
118
|
-
# Train handles connection retries for us
|
119
|
-
Train.create(protocol, train_config)
|
120
|
-
rescue SocketError => e # likely a dns failure, not caught by train
|
121
|
-
e.message.replace "Error connecting to #{train_config[:target]} - #{e.message}"
|
122
|
-
raise e
|
123
|
-
rescue Train::PluginLoadError
|
124
|
-
logger.error("Invalid target mode protocol: #{protocol}")
|
125
|
-
exit(false)
|
24
|
+
def config
|
25
|
+
require "chef/config" unless defined?(Chef::Config)
|
26
|
+
Chef::Config
|
126
27
|
end
|
127
28
|
end
|
128
29
|
end
|
data/lib/chef/util/backup.rb
CHANGED
@@ -36,7 +36,7 @@ class Chef
|
|
36
36
|
slice_number = @new_resource.backup
|
37
37
|
backup_files = sorted_backup_files
|
38
38
|
if backup_files.length >= @new_resource.backup
|
39
|
-
remainder = backup_files.slice(slice_number
|
39
|
+
remainder = backup_files.slice(slice_number..)
|
40
40
|
remainder.each do |backup_to_delete|
|
41
41
|
delete_backup(backup_to_delete)
|
42
42
|
end
|
@@ -87,7 +87,7 @@ class Chef
|
|
87
87
|
end
|
88
88
|
|
89
89
|
def sorted_backup_files
|
90
|
-
unsorted_backup_files.sort { |a, b| b <=> a }
|
90
|
+
unsorted_backup_files.sort.reverse # faster than sort { |a, b| b <=> a }
|
91
91
|
end
|
92
92
|
end
|
93
93
|
end
|
data/lib/chef/util/diff.rb
CHANGED
@@ -40,15 +40,11 @@
|
|
40
40
|
# CONNECTION WITH THE SOFTWARE OR THE USE OF OTHER DEALINGS IN THE
|
41
41
|
# SOFTWARE.
|
42
42
|
|
43
|
-
require "diff/lcs"
|
44
|
-
require "diff/lcs/hunk"
|
45
|
-
|
46
43
|
class Chef
|
47
44
|
class Util
|
48
45
|
class Diff
|
49
46
|
# @todo: to_a, to_s, to_json, inspect defs, accessors for @diff and @error
|
50
47
|
# @todo: move coercion to UTF-8 into to_json
|
51
|
-
# @todo: replace shellout to diff -u with diff-lcs gem
|
52
48
|
|
53
49
|
def for_output
|
54
50
|
# formatted output to a terminal uses arrays of strings and returns error strings
|
@@ -64,7 +60,7 @@ class Chef
|
|
64
60
|
|
65
61
|
def use_tempfile_if_missing(file)
|
66
62
|
tempfile = nil
|
67
|
-
unless File.
|
63
|
+
unless File.exist?(file)
|
68
64
|
Chef::Log.trace("File #{file} does not exist to diff against, using empty tempfile")
|
69
65
|
tempfile = Tempfile.new("chef-diff")
|
70
66
|
file = tempfile.path
|
@@ -87,6 +83,9 @@ class Chef
|
|
87
83
|
# produces a unified-output-format diff with 3 lines of context
|
88
84
|
# ChefFS uses udiff() directly
|
89
85
|
def udiff(old_file, new_file)
|
86
|
+
require "diff/lcs"
|
87
|
+
require "diff/lcs/hunk"
|
88
|
+
|
90
89
|
diff_str = ""
|
91
90
|
file_length_difference = 0
|
92
91
|
|
@@ -107,16 +106,16 @@ class Chef
|
|
107
106
|
# join them. otherwise, print out the old one.
|
108
107
|
old_hunk = hunk = nil
|
109
108
|
diff_data.each do |piece|
|
110
|
-
|
111
|
-
|
112
|
-
|
113
|
-
|
114
|
-
|
115
|
-
|
116
|
-
|
117
|
-
|
118
|
-
|
119
|
-
|
109
|
+
|
110
|
+
hunk = ::Diff::LCS::Hunk.new(old_data, new_data, piece, 3, file_length_difference)
|
111
|
+
file_length_difference = hunk.file_length_difference
|
112
|
+
next unless old_hunk
|
113
|
+
next if hunk.merge(old_hunk)
|
114
|
+
|
115
|
+
diff_str << old_hunk.diff(:unified) << "\n"
|
116
|
+
ensure
|
117
|
+
old_hunk = hunk
|
118
|
+
|
120
119
|
end
|
121
120
|
diff_str << old_hunk.diff(:unified) << "\n"
|
122
121
|
diff_str
|
@@ -136,7 +135,7 @@ class Chef
|
|
136
135
|
return "(file sizes exceed #{diff_filesize_threshold} bytes, diff output suppressed)"
|
137
136
|
end
|
138
137
|
|
139
|
-
#
|
138
|
+
# macOS(BSD?) diff will *sometimes* happily spit out nasty binary diffs
|
140
139
|
return "(current file is binary, diff output suppressed)" if is_binary?(old_file)
|
141
140
|
return "(new content is binary, diff output suppressed)" if is_binary?(new_file)
|
142
141
|
|
@@ -171,7 +170,7 @@ class Chef
|
|
171
170
|
begin
|
172
171
|
return buff !~ /\A[\s[:print:]]*\z/m
|
173
172
|
rescue ArgumentError => e
|
174
|
-
return true if
|
173
|
+
return true if /invalid byte sequence/.match?(e.message)
|
175
174
|
|
176
175
|
raise
|
177
176
|
end
|
@@ -16,36 +16,34 @@
|
|
16
16
|
# limitations under the License.
|
17
17
|
#
|
18
18
|
|
19
|
-
require_relative "
|
19
|
+
require_relative "../../mixin/powershell_exec"
|
20
20
|
|
21
21
|
class Chef::Util::DSC
|
22
22
|
class ConfigurationGenerator
|
23
|
+
include Chef::Mixin::PowershellExec
|
24
|
+
|
23
25
|
def initialize(node, config_directory)
|
24
26
|
@node = node
|
25
27
|
@config_directory = config_directory
|
26
28
|
end
|
27
29
|
|
28
|
-
def configuration_document_from_script_code(code, configuration_flags, imports
|
30
|
+
def configuration_document_from_script_code(code, configuration_flags, imports)
|
29
31
|
Chef::Log.trace("DSC: DSC code:\n '#{code}'")
|
30
32
|
generated_script_path = write_document_generation_script(code, "chef_dsc", imports)
|
31
33
|
begin
|
32
|
-
configuration_document_from_script_path(generated_script_path, "chef_dsc", configuration_flags
|
34
|
+
configuration_document_from_script_path(generated_script_path, "chef_dsc", configuration_flags)
|
33
35
|
ensure
|
34
36
|
::FileUtils.rm(generated_script_path)
|
35
37
|
end
|
36
38
|
end
|
37
39
|
|
38
|
-
def configuration_document_from_script_path(script_path, configuration_name, configuration_flags
|
40
|
+
def configuration_document_from_script_path(script_path, configuration_name, configuration_flags)
|
39
41
|
validate_configuration_name!(configuration_name)
|
40
42
|
|
41
|
-
|
42
|
-
|
43
|
-
configuration_document_generation_code(script_path, configuration_name)
|
44
|
-
)
|
45
|
-
|
46
|
-
merged_configuration_flags = get_merged_configuration_flags!(configuration_flags, configuration_name)
|
43
|
+
config_generation_code = configuration_document_generation_code(script_path, configuration_name)
|
44
|
+
switches_string = command_switches_string(get_merged_configuration_flags!(configuration_flags, configuration_name))
|
47
45
|
|
48
|
-
|
46
|
+
powershell_exec!("#{config_generation_code} #{switches_string}")
|
49
47
|
configuration_document_location = find_configuration_document(configuration_name)
|
50
48
|
|
51
49
|
unless configuration_document_location
|
@@ -59,12 +57,55 @@ class Chef::Util::DSC
|
|
59
57
|
|
60
58
|
protected
|
61
59
|
|
60
|
+
def validate_switch_name!(switch_parameter_name)
|
61
|
+
unless switch_parameter_name.match?(/\A[A-Za-z]+[_a-zA-Z0-9]*\Z/)
|
62
|
+
raise ArgumentError, "`#{switch_parameter_name}` is not a valid PowerShell cmdlet switch parameter name"
|
63
|
+
end
|
64
|
+
end
|
65
|
+
|
66
|
+
def escape_parameter_value(parameter_value)
|
67
|
+
parameter_value.gsub(/(`|'|"|#)/, '`\1')
|
68
|
+
end
|
69
|
+
|
70
|
+
def escape_string_parameter_value(parameter_value)
|
71
|
+
"'#{escape_parameter_value(parameter_value)}'"
|
72
|
+
end
|
73
|
+
|
74
|
+
def command_switches_string(switches)
|
75
|
+
command_switches = switches.map do |switch_name, switch_value|
|
76
|
+
if switch_name.class != Symbol
|
77
|
+
raise ArgumentError, "Invalid type `#{switch_name} `for PowerShell switch '#{switch_name}'. The switch must be specified as a Symbol'"
|
78
|
+
end
|
79
|
+
|
80
|
+
validate_switch_name!(switch_name)
|
81
|
+
|
82
|
+
switch_argument = ""
|
83
|
+
switch_present = true
|
84
|
+
|
85
|
+
case switch_value
|
86
|
+
when Numeric, Float
|
87
|
+
switch_argument = switch_value.to_s
|
88
|
+
when FalseClass
|
89
|
+
switch_present = false
|
90
|
+
when TrueClass
|
91
|
+
when String
|
92
|
+
switch_argument = escape_string_parameter_value(switch_value)
|
93
|
+
else
|
94
|
+
raise ArgumentError, "Invalid argument type `#{switch_value.class}` specified for PowerShell switch `:#{switch_name}`. Arguments to PowerShell must be of type `String`, `Numeric`, `Float`, `FalseClass`, or `TrueClass`"
|
95
|
+
end
|
96
|
+
|
97
|
+
switch_present ? ["-#{switch_name.to_s.downcase}", switch_argument].join(" ").strip : ""
|
98
|
+
end
|
99
|
+
|
100
|
+
command_switches.join(" ")
|
101
|
+
end
|
102
|
+
|
62
103
|
# From PowerShell error help for the Configuration language element:
|
63
104
|
# Standard names may only contain letters (a-z, A-Z), numbers (0-9), and underscore (_).
|
64
105
|
# The name may not be null or empty, and should start with a letter.
|
65
106
|
def validate_configuration_name!(configuration_name)
|
66
107
|
if !!(configuration_name =~ /\A[A-Za-z]+[_a-zA-Z0-9]*\Z/) == false
|
67
|
-
raise ArgumentError,
|
108
|
+
raise ArgumentError, "Configuration `#{configuration_name}` is not a valid PowerShell cmdlet name"
|
68
109
|
end
|
69
110
|
end
|
70
111
|
|
@@ -75,23 +75,21 @@ class Chef
|
|
75
75
|
#
|
76
76
|
|
77
77
|
def self.parse(lcm_output, test_dsc_configuration)
|
78
|
+
lcm_output = String(lcm_output).split("\n")
|
78
79
|
test_dsc_configuration ? test_dsc_parser(lcm_output) : what_if_parser(lcm_output)
|
79
80
|
end
|
80
81
|
|
81
82
|
def self.test_dsc_parser(lcm_output)
|
82
|
-
lcm_output ||= ""
|
83
83
|
current_resource = {}
|
84
84
|
|
85
85
|
resources = []
|
86
|
-
lcm_output.
|
86
|
+
lcm_output.each do |line|
|
87
87
|
op_action , op_value = line.strip.split(":")
|
88
88
|
op_action&.strip!
|
89
89
|
case op_action
|
90
90
|
when "InDesiredState"
|
91
91
|
current_resource[:skipped] = op_value.strip == "True" ? true : false
|
92
|
-
when "ResourcesInDesiredState"
|
93
|
-
current_resource[:name] = op_value.strip if op_value
|
94
|
-
when "ResourcesNotInDesiredState"
|
92
|
+
when "ResourcesInDesiredState", "ResourcesNotInDesiredState"
|
95
93
|
current_resource[:name] = op_value.strip if op_value
|
96
94
|
when "ReturnValue"
|
97
95
|
current_resource[:context] = nil
|
@@ -109,11 +107,10 @@ class Chef
|
|
109
107
|
end
|
110
108
|
|
111
109
|
def self.what_if_parser(lcm_output)
|
112
|
-
lcm_output ||= ""
|
113
110
|
current_resource = {}
|
114
111
|
|
115
112
|
resources = []
|
116
|
-
lcm_output.
|
113
|
+
lcm_output.each do |line|
|
117
114
|
op_action, op_type, info = parse_line(line)
|
118
115
|
|
119
116
|
case op_action
|
@@ -16,25 +16,27 @@
|
|
16
16
|
# limitations under the License.
|
17
17
|
#
|
18
18
|
|
19
|
-
require_relative "
|
19
|
+
require_relative "../../mixin/powershell_exec"
|
20
20
|
require_relative "lcm_output_parser"
|
21
21
|
|
22
22
|
class Chef::Util::DSC
|
23
23
|
class LocalConfigurationManager
|
24
|
+
include Chef::Mixin::PowershellExec
|
25
|
+
|
24
26
|
def initialize(node, configuration_path)
|
25
27
|
@node = node
|
26
28
|
@configuration_path = configuration_path
|
27
29
|
clear_execution_time
|
28
30
|
end
|
29
31
|
|
30
|
-
def test_configuration(configuration_document
|
31
|
-
status = run_configuration_cmdlet(configuration_document, false
|
32
|
-
log_dsc_exception(status.
|
33
|
-
configuration_update_required?(status.
|
32
|
+
def test_configuration(configuration_document)
|
33
|
+
status = run_configuration_cmdlet(configuration_document, false)
|
34
|
+
log_dsc_exception(status.errors.join("\n")) if status.error?
|
35
|
+
configuration_update_required?(status.result)
|
34
36
|
end
|
35
37
|
|
36
|
-
def set_configuration(configuration_document
|
37
|
-
run_configuration_cmdlet(configuration_document, true
|
38
|
+
def set_configuration(configuration_document)
|
39
|
+
run_configuration_cmdlet(configuration_document, true)
|
38
40
|
end
|
39
41
|
|
40
42
|
def last_operation_execution_time_seconds
|
@@ -45,7 +47,7 @@ class Chef::Util::DSC
|
|
45
47
|
|
46
48
|
private
|
47
49
|
|
48
|
-
def run_configuration_cmdlet(configuration_document, apply_configuration
|
50
|
+
def run_configuration_cmdlet(configuration_document, apply_configuration)
|
49
51
|
Chef::Log.trace("DSC: Calling DSC Local Config Manager to #{apply_configuration ? "set" : "test"} configuration document.")
|
50
52
|
|
51
53
|
start_operation_timing
|
@@ -53,11 +55,12 @@ class Chef::Util::DSC
|
|
53
55
|
|
54
56
|
begin
|
55
57
|
save_configuration_document(configuration_document)
|
56
|
-
|
58
|
+
cmd = lcm_command(apply_configuration)
|
59
|
+
Chef::Log.trace("DSC: Calling DSC Local Config Manager with:\n#{cmd}")
|
60
|
+
|
61
|
+
status = powershell_exec(cmd)
|
57
62
|
if apply_configuration
|
58
|
-
status
|
59
|
-
else
|
60
|
-
status = cmdlet.run({}, shellout_flags)
|
63
|
+
status.error!
|
61
64
|
end
|
62
65
|
ensure
|
63
66
|
end_operation_timing
|
@@ -77,7 +80,7 @@ class Chef::Util::DSC
|
|
77
80
|
ps4_base_command
|
78
81
|
else
|
79
82
|
if ps_version_gte_5?
|
80
|
-
"#{common_command_prefix} Test-DscConfiguration -path #{@configuration_path} | format-list"
|
83
|
+
"#{common_command_prefix} Test-DscConfiguration -path #{@configuration_path} | format-list | Out-String"
|
81
84
|
else
|
82
85
|
ps4_base_command + " -whatif; if (! $?) { exit 1 }"
|
83
86
|
end
|
@@ -100,12 +103,12 @@ class Chef::Util::DSC
|
|
100
103
|
end
|
101
104
|
|
102
105
|
def whatif_not_supported?(dsc_exception_output)
|
103
|
-
!! (dsc_exception_output.gsub(/[\
|
106
|
+
!! (dsc_exception_output.gsub(/[\n]+/, "").gsub(/\s+/, " ") =~ /A parameter cannot be found that matches parameter name 'Whatif'/i)
|
104
107
|
end
|
105
108
|
|
106
109
|
def dsc_module_import_failure?(command_output)
|
107
110
|
!! (command_output =~ /\sCimException/ &&
|
108
|
-
command_output
|
111
|
+
command_output.include?("ProviderOperationExecutionFailure") &&
|
109
112
|
command_output =~ /\smodule\s+is\s+installed/)
|
110
113
|
end
|
111
114
|
|
@@ -16,14 +16,14 @@
|
|
16
16
|
# limitations under the License.
|
17
17
|
#
|
18
18
|
|
19
|
-
require_relative "
|
20
|
-
require_relative "../powershell/cmdlet_result"
|
19
|
+
require_relative "../../mixin/powershell_exec"
|
21
20
|
require_relative "../../exceptions"
|
22
21
|
|
23
22
|
class Chef
|
24
23
|
class Util
|
25
24
|
class DSC
|
26
25
|
class ResourceStore
|
26
|
+
include Chef::Mixin::PowershellExec
|
27
27
|
|
28
28
|
def self.instance
|
29
29
|
@@instance ||= ResourceStore.new.tap do |store|
|
@@ -83,19 +83,13 @@ class Chef
|
|
83
83
|
|
84
84
|
# Returns a list of dsc resources
|
85
85
|
def query_resources
|
86
|
-
|
87
|
-
:object)
|
88
|
-
result = cmdlet.run
|
89
|
-
result.return_value
|
86
|
+
powershell_exec("get-dscresource").result
|
90
87
|
end
|
91
88
|
|
92
89
|
# Returns a list of dsc resources matching the provided name
|
93
90
|
def query_resource(resource_name)
|
94
|
-
|
95
|
-
|
96
|
-
result = cmdlet.run
|
97
|
-
ret_val = result.return_value
|
98
|
-
if ret_val.nil?
|
91
|
+
ret_val = powershell_exec("get-dscresource #{resource_name}").result
|
92
|
+
if ret_val.empty?
|
99
93
|
[]
|
100
94
|
elsif ret_val.is_a? Array
|
101
95
|
ret_val
|