chef 16.4.41 → 16.8.9
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/Gemfile +6 -14
- data/README.md +1 -1
- data/Rakefile +22 -15
- data/bin/knife +1 -1
- data/chef-universal-mingw32.gemspec +1 -1
- data/chef.gemspec +4 -2
- data/lib/chef/application.rb +19 -17
- data/lib/chef/application/apply.rb +12 -7
- data/lib/chef/application/base.rb +27 -24
- data/lib/chef/application/client.rb +16 -5
- 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 +14 -14
- data/lib/chef/application/windows_service_manager.rb +6 -6
- data/lib/chef/chef_fs/chef_fs_data_store.rb +1 -1
- data/lib/chef/chef_fs/data_handler/cookbook_data_handler.rb +1 -1
- data/lib/chef/chef_fs/file_pattern.rb +1 -1
- data/lib/chef/chef_fs/file_system/repository/chef_repository_file_system_cookbook_entry.rb +1 -1
- data/lib/chef/chef_fs/knife.rb +2 -2
- data/lib/chef/chef_fs/parallelizer.rb +0 -1
- data/lib/chef/client.rb +16 -43
- data/lib/chef/compliance/default_attributes.rb +89 -0
- data/lib/chef/compliance/fetcher/automate.rb +69 -0
- data/lib/chef/compliance/fetcher/chef_server.rb +134 -0
- data/lib/chef/compliance/reporter/automate.rb +202 -0
- data/lib/chef/compliance/reporter/chef_server_automate.rb +92 -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 +250 -0
- data/lib/chef/cookbook/cookbook_version_loader.rb +1 -1
- data/lib/chef/cookbook/gem_installer.rb +1 -1
- data/lib/chef/cookbook/synchronizer.rb +2 -2
- 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 +2 -5
- data/lib/chef/data_collector.rb +7 -6
- data/lib/chef/data_collector/config_validation.rb +22 -13
- data/lib/chef/data_collector/run_end_message.rb +2 -2
- data/lib/chef/data_collector/run_start_message.rb +1 -1
- data/lib/chef/deprecated.rb +1 -1
- data/lib/chef/deprecation/warnings.rb +2 -2
- data/lib/chef/digester.rb +2 -2
- 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 +1 -1
- data/lib/chef/encrypted_data_bag_item.rb +3 -4
- 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/environment.rb +3 -3
- data/lib/chef/event_loggers/windows_eventlog.rb +2 -2
- data/lib/chef/exceptions.rb +9 -5
- data/lib/chef/file_access_control/windows.rb +6 -5
- data/lib/chef/file_content_management/tempfile.rb +1 -1
- 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 +2 -2
- 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 +6 -6
- data/lib/chef/formatters/error_inspectors/run_list_expansion_error_inspector.rb +3 -3
- 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/http.rb +6 -14
- data/lib/chef/http/auth_credentials.rb +5 -1
- data/lib/chef/http/authenticator.rb +1 -1
- data/lib/chef/http/basic_client.rb +4 -2
- data/lib/chef/http/decompressor.rb +1 -1
- data/lib/chef/http/http_request.rb +7 -5
- data/lib/chef/http/socketless_chef_zero_client.rb +5 -2
- data/lib/chef/http/ssl_policies.rb +7 -1
- data/lib/chef/json_compat.rb +3 -8
- data/lib/chef/key.rb +1 -1
- data/lib/chef/knife.rb +4 -4
- data/lib/chef/knife/bootstrap.rb +18 -15
- data/lib/chef/knife/bootstrap/chef_vault_handler.rb +1 -1
- data/lib/chef/knife/bootstrap/templates/chef-full.erb +3 -3
- data/lib/chef/knife/bootstrap/templates/windows-chef-client-msi.erb +9 -9
- data/lib/chef/knife/bootstrap/train_connector.rb +1 -1
- data/lib/chef/knife/client_create.rb +3 -3
- data/lib/chef/knife/config_get.rb +8 -97
- 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 -98
- 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 +9 -24
- data/lib/chef/knife/configure.rb +2 -2
- data/lib/chef/knife/core/bootstrap_context.rb +2 -2
- data/lib/chef/knife/core/cookbook_scm_repo.rb +1 -1
- data/lib/chef/knife/core/gem_glob_loader.rb +1 -1
- data/lib/chef/knife/core/object_loader.rb +1 -1
- data/lib/chef/knife/core/ui.rb +5 -2
- data/lib/chef/knife/core/windows_bootstrap_context.rb +18 -15
- data/lib/chef/knife/exec.rb +2 -2
- 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 +1 -1
- data/lib/chef/knife/node_run_list_set.rb +1 -1
- data/lib/chef/knife/node_show.rb +2 -2
- 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 +0 -1
- data/lib/chef/knife/serve.rb +3 -3
- data/lib/chef/knife/ssh.rb +19 -4
- data/lib/chef/knife/ssl_check.rb +3 -3
- data/lib/chef/knife/status.rb +2 -2
- 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/yaml_convert.rb +1 -1
- 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/mixin/convert_to_class_name.rb +0 -56
- data/lib/chef/mixin/deep_merge.rb +0 -12
- data/lib/chef/mixin/openssl_helper.rb +2 -5
- data/lib/chef/mixin/powershell_exec.rb +24 -10
- data/lib/chef/mixin/powershell_out.rb +12 -5
- data/lib/chef/mixin/properties.rb +2 -0
- data/lib/chef/mixin/template.rb +3 -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/node/attribute_collections.rb +2 -6
- data/lib/chef/node/mixin/immutablize_hash.rb +2 -0
- data/lib/chef/node_map.rb +4 -4
- data/lib/chef/platform/query_helpers.rb +4 -4
- data/lib/chef/policy_builder/dynamic.rb +2 -0
- data/lib/chef/policy_builder/policyfile.rb +2 -2
- data/lib/chef/powershell.rb +10 -4
- data/lib/chef/property.rb +1 -1
- data/lib/chef/provider.rb +1 -5
- data/lib/chef/provider/cron.rb +2 -13
- data/lib/chef/provider/dsc_resource.rb +12 -24
- data/lib/chef/provider/dsc_script.rb +16 -20
- data/lib/chef/provider/file.rb +2 -2
- data/lib/chef/provider/git.rb +5 -5
- data/lib/chef/provider/group.rb +14 -6
- data/lib/chef/provider/group/windows.rb +12 -1
- data/lib/chef/provider/ifconfig.rb +9 -9
- data/lib/chef/provider/ifconfig/debian.rb +38 -22
- data/lib/chef/provider/ifconfig/redhat.rb +54 -18
- data/lib/chef/provider/launchd.rb +3 -13
- data/lib/chef/provider/link.rb +0 -9
- data/lib/chef/provider/mount.rb +18 -1
- data/lib/chef/provider/mount/linux.rb +67 -0
- data/lib/chef/provider/mount/mount.rb +41 -43
- data/lib/chef/provider/package.rb +3 -0
- data/lib/chef/provider/package/apt.rb +1 -1
- data/lib/chef/provider/package/chocolatey.rb +6 -6
- 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 +1 -1
- data/lib/chef/provider/package/homebrew.rb +1 -1
- data/lib/chef/provider/package/ips.rb +1 -1
- data/lib/chef/provider/package/powershell.rb +2 -3
- data/lib/chef/provider/package/rubygems.rb +22 -19
- data/lib/chef/provider/package/snap.rb +1 -4
- data/lib/chef/provider/package/solaris.rb +0 -2
- data/lib/chef/provider/package/windows.rb +2 -2
- data/lib/chef/provider/package/windows/registry_uninstall_entry.rb +3 -1
- data/lib/chef/provider/package/yum/rpm_utils.rb +1 -1
- data/lib/chef/provider/package/zypper.rb +99 -72
- data/lib/chef/provider/powershell_script.rb +12 -1
- 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/sftp.rb +6 -4
- data/lib/chef/provider/route.rb +4 -8
- data/lib/chef/provider/service/debian.rb +2 -1
- data/lib/chef/provider/service/macosx.rb +2 -2
- data/lib/chef/provider/service/redhat.rb +1 -1
- data/lib/chef/provider/template_finder.rb +2 -10
- data/lib/chef/provider/user.rb +17 -9
- data/lib/chef/provider/user/aix.rb +1 -1
- data/lib/chef/provider/user/dscl.rb +5 -5
- data/lib/chef/provider/user/mac.rb +15 -7
- data/lib/chef/provider/user/solaris.rb +1 -1
- data/lib/chef/provider/user/windows.rb +10 -3
- data/lib/chef/provider/zypper_repository.rb +2 -2
- data/lib/chef/provider_resolver.rb +1 -1
- data/lib/chef/providers.rb +1 -3
- data/lib/chef/pwsh.rb +71 -0
- data/lib/chef/recipe.rb +2 -2
- data/lib/chef/resource.rb +2 -2
- data/lib/chef/resource/apt_repository.rb +6 -5
- data/lib/chef/resource/bash.rb +119 -1
- data/lib/chef/resource/batch.rb +1 -1
- data/lib/chef/resource/bff_package.rb +22 -0
- data/lib/chef/resource/breakpoint.rb +59 -2
- data/lib/chef/resource/build_essential.rb +5 -8
- 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 +35 -28
- data/lib/chef/resource/chef_client_launchd.rb +194 -0
- data/lib/chef/resource/chef_client_scheduled_task.rb +24 -21
- data/lib/chef/resource/chef_client_systemd_timer.rb +27 -20
- data/lib/chef/resource/chef_client_trusted_certificate.rb +101 -0
- data/lib/chef/resource/chef_gem.rb +10 -10
- 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 +1 -1
- data/lib/chef/resource/cookbook_file.rb +2 -2
- data/lib/chef/resource/cron/_cron_shared.rb +1 -0
- data/lib/chef/resource/cron/cron_d.rb +2 -3
- data/lib/chef/resource/csh.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 +10 -8
- data/lib/chef/resource/file.rb +4 -4
- data/lib/chef/resource/gem_package.rb +5 -5
- data/lib/chef/resource/homebrew_package.rb +3 -3
- data/lib/chef/resource/homebrew_update.rb +9 -6
- data/lib/chef/resource/hostname.rb +7 -7
- data/lib/chef/resource/ifconfig.rb +52 -5
- data/lib/chef/resource/kernel_module.rb +1 -1
- data/lib/chef/resource/ksh.rb +3 -3
- data/lib/chef/resource/launchd.rb +17 -16
- data/lib/chef/resource/locale.rb +2 -2
- data/lib/chef/resource/lwrp_base.rb +3 -5
- data/lib/chef/resource/macos_userdefaults.rb +3 -3
- data/lib/chef/resource/mount.rb +8 -2
- 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 +27 -5
- data/lib/chef/resource/openssl_ec_private_key.rb +6 -3
- data/lib/chef/resource/openssl_ec_public_key.rb +2 -2
- data/lib/chef/resource/openssl_rsa_private_key.rb +6 -3
- data/lib/chef/resource/openssl_x509_certificate.rb +14 -14
- data/lib/chef/resource/openssl_x509_crl.rb +19 -10
- data/lib/chef/resource/openssl_x509_request.rb +14 -16
- data/lib/chef/resource/osx_profile.rb +77 -13
- data/lib/chef/resource/perl.rb +2 -2
- data/lib/chef/resource/plist.rb +3 -7
- data/lib/chef/resource/powershell_package_source.rb +24 -23
- data/lib/chef/resource/powershell_script.rb +14 -11
- data/lib/chef/resource/python.rb +2 -2
- data/lib/chef/resource/reboot.rb +2 -2
- data/lib/chef/resource/registry_key.rb +93 -2
- data/lib/chef/resource/remote_file.rb +3 -3
- data/lib/chef/resource/rhsm_register.rb +22 -10
- data/lib/chef/resource/route.rb +1 -1
- data/lib/chef/resource/ruby.rb +2 -2
- 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 +3 -3
- data/lib/chef/resource/solaris_package.rb +0 -2
- data/lib/chef/resource/ssh_known_hosts_entry.rb +2 -2
- data/lib/chef/resource/sudo.rb +1 -1
- data/lib/chef/resource/support/client.erb +64 -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/sysctl.rb +1 -5
- data/lib/chef/resource/systemd_unit.rb +44 -3
- data/lib/chef/resource/template.rb +4 -4
- data/lib/chef/resource/windows_ad_join.rb +19 -12
- data/lib/chef/resource/windows_audit_policy.rb +26 -24
- data/lib/chef/resource/windows_certificate.rb +19 -11
- data/lib/chef/resource/windows_dfs_server.rb +7 -4
- data/lib/chef/resource/windows_env.rb +173 -0
- data/lib/chef/resource/windows_feature.rb +2 -0
- data/lib/chef/resource/windows_firewall_profile.rb +28 -31
- data/lib/chef/resource/windows_firewall_rule.rb +9 -11
- data/lib/chef/resource/windows_font.rb +1 -1
- data/lib/chef/resource/windows_package.rb +29 -5
- data/lib/chef/resource/windows_path.rb +38 -0
- data/lib/chef/resource/windows_printer.rb +5 -3
- data/lib/chef/resource/windows_printer_port.rb +6 -4
- data/lib/chef/resource/windows_security_policy.rb +5 -5
- data/lib/chef/resource/windows_service.rb +108 -0
- data/lib/chef/resource/windows_share.rb +18 -18
- data/lib/chef/resource/windows_task.rb +629 -28
- data/lib/chef/resource/windows_user_privilege.rb +53 -54
- data/lib/chef/resource/windows_workgroup.rb +9 -7
- data/lib/chef/resource/yum_package.rb +2 -2
- data/lib/chef/resource/yum_repository.rb +1 -1
- data/lib/chef/resource_collection/resource_set.rb +2 -6
- data/lib/chef/resource_inspector.rb +77 -75
- data/lib/chef/resource_reporter.rb +0 -2
- data/lib/chef/resources.rb +4 -1
- data/lib/chef/run_context.rb +2 -2
- data/lib/chef/run_context/cookbook_compiler.rb +1 -1
- data/lib/chef/run_lock.rb +3 -3
- data/lib/chef/search/query.rb +6 -5
- data/lib/chef/server_api.rb +0 -4
- data/lib/chef/shell.rb +31 -26
- data/lib/chef/shell/ext.rb +12 -12
- data/lib/chef/shell/shell_session.rb +2 -2
- data/lib/chef/train_transport.rb +5 -104
- data/lib/chef/util/backup.rb +1 -1
- data/lib/chef/util/diff.rb +3 -3
- data/lib/chef/util/dsc/configuration_generator.rb +52 -11
- 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/version.rb +1 -1
- data/lib/chef/win32/api/file.rb +4 -0
- data/lib/chef/win32/crypto.rb +1 -1
- data/lib/chef/win32/file.rb +1 -1
- data/lib/chef/win32/registry.rb +1 -2
- data/lib/chef/win32/security/sid.rb +1 -1
- data/lib/chef/win32/unicode.rb +1 -1
- data/spec/data/shef-config.rb +1 -1
- data/spec/functional/event_loggers/windows_eventlog_spec.rb +6 -5
- data/spec/functional/mixin/powershell_out_spec.rb +11 -3
- data/spec/functional/resource/aix_service_spec.rb +2 -2
- data/spec/functional/resource/aixinit_service_spec.rb +1 -1
- data/spec/functional/resource/apt_package_spec.rb +4 -6
- data/spec/functional/resource/chocolatey_package_spec.rb +3 -3
- data/spec/functional/resource/cron_spec.rb +3 -3
- data/spec/functional/resource/dsc_script_spec.rb +6 -9
- data/spec/functional/resource/insserv_spec.rb +1 -1
- data/spec/functional/resource/mount_spec.rb +10 -2
- data/spec/functional/resource/powershell_package_source_spec.rb +107 -0
- data/spec/functional/resource/powershell_script_spec.rb +57 -14
- 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 +10 -6
- data/spec/functional/resource/windows_firewall_rule_spec.rb +93 -0
- data/spec/functional/resource/windows_package_spec.rb +36 -10
- data/spec/functional/resource/windows_share_spec.rb +103 -0
- data/spec/functional/resource/windows_task_spec.rb +15 -16
- data/spec/functional/resource/zypper_package_spec.rb +11 -0
- data/spec/functional/version_spec.rb +3 -3
- data/spec/integration/client/client_spec.rb +6 -5
- data/spec/integration/client/exit_code_spec.rb +3 -2
- data/spec/integration/client/ipv6_spec.rb +1 -1
- data/spec/integration/compliance/compliance_spec.rb +81 -0
- data/spec/integration/knife/client_key_create_spec.rb +1 -1
- data/spec/integration/knife/{config_list_profiles_spec.rb → config_list_spec.rb} +30 -29
- data/spec/integration/knife/{config_get_spec.rb → config_show_spec.rb} +3 -3
- data/spec/integration/knife/{config_use_profile_spec.rb → config_use_spec.rb} +53 -10
- data/spec/integration/knife/cookbook_api_ipv6_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_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/ohai/ohai_spec.rb +61 -0
- data/spec/integration/recipes/notifies_spec.rb +1 -1
- data/spec/integration/recipes/provider_choice.rb +2 -2
- data/spec/integration/recipes/recipe_dsl_spec.rb +1 -0
- data/spec/integration/recipes/remote_directory.rb +1 -1
- data/spec/integration/solo/solo_spec.rb +5 -5
- data/spec/spec_helper.rb +9 -7
- data/spec/stress/win32/file_spec.rb +1 -1
- data/spec/support/chef_helpers.rb +2 -2
- 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 +27 -38
- data/spec/support/shared/functional/securable_resource.rb +108 -27
- data/spec/support/shared/functional/win32_service.rb +1 -1
- data/spec/support/shared/unit/application_dot_d.rb +5 -3
- data/spec/support/shared/unit/knife_shared.rb +1 -1
- data/spec/support/shared/unit/script_resource.rb +4 -4
- data/spec/support/shared/unit/windows_script_resource.rb +1 -1
- 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_spec.rb +4 -6
- data/spec/unit/chef_fs/config_spec.rb +1 -1
- data/spec/unit/chef_fs/data_handler/data_bag_item_data_handler.rb +1 -1
- data/spec/unit/chef_fs/parallelizer_spec.rb +5 -1
- data/spec/unit/chef_fs/path_util_spec.rb +1 -1
- data/spec/unit/client_spec.rb +17 -0
- data/spec/unit/compliance/fetcher/automate_spec.rb +134 -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 +113 -0
- data/spec/unit/cookbook/synchronizer_spec.rb +2 -2
- data/spec/unit/cookbook_spec.rb +2 -2
- data/spec/unit/data_collector/config_validation_spec.rb +208 -0
- data/spec/unit/data_collector_spec.rb +0 -117
- data/spec/unit/dsl/declare_resource_spec.rb +1 -1
- data/spec/unit/file_access_control_spec.rb +1 -1
- data/spec/unit/guard_interpreter/resource_guard_interpreter_spec.rb +11 -11
- data/spec/unit/http/ssl_policies_spec.rb +11 -0
- data/spec/unit/knife/bootstrap_spec.rb +6 -6
- 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 +2 -2
- data/spec/unit/knife/cookbook_list_spec.rb +2 -2
- data/spec/unit/knife/cookbook_metadata_spec.rb +3 -3
- data/spec/unit/knife/core/node_editor_spec.rb +1 -1
- data/spec/unit/knife/core/ui_spec.rb +1 -0
- 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/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/lwrp_spec.rb +3 -3
- data/spec/unit/mixin/deep_merge_spec.rb +15 -0
- data/spec/unit/mixin/openssl_helper_spec.rb +1 -1
- data/spec/unit/mixin/powershell_exec_spec.rb +40 -3
- data/spec/unit/mixin/powershell_out_spec.rb +14 -0
- data/spec/unit/mixin/securable_spec.rb +2 -2
- data/spec/unit/mixin/which.rb +1 -1
- data/spec/unit/node/immutable_collections_spec.rb +2 -2
- data/spec/unit/platform/query_helpers_spec.rb +11 -12
- data/spec/unit/provider/dsc_resource_spec.rb +10 -27
- data/spec/unit/provider/dsc_script_spec.rb +1 -1
- data/spec/unit/provider/group/windows_spec.rb +6 -0
- data/spec/unit/provider/group_spec.rb +1 -1
- data/spec/unit/provider/mount/linux_spec.rb +107 -0
- data/spec/unit/provider/mount/mount_spec.rb +21 -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/powershell_spec.rb +88 -96
- data/spec/unit/provider/package/rubygems_spec.rb +4 -1
- 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 +11 -0
- data/spec/unit/provider/route_spec.rb +0 -2
- data/spec/unit/provider/subversion_spec.rb +0 -3
- data/spec/unit/provider/systemd_unit_spec.rb +1 -1
- data/spec/unit/provider/user_spec.rb +7 -1
- data/spec/unit/provider/windows_env_spec.rb +18 -34
- data/spec/unit/provider/windows_path_spec.rb +6 -11
- data/spec/unit/provider/windows_task_spec.rb +7 -6
- data/spec/unit/recipe_spec.rb +1 -1
- 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 +35 -14
- data/spec/unit/resource/chef_client_launchd_spec.rb +127 -0
- data/spec/unit/resource/chef_client_systemd_timer_spec.rb +36 -1
- data/spec/unit/resource/chef_client_trusted_certificate_spec.rb +54 -0
- data/spec/unit/resource/ifconfig_spec.rb +2 -10
- data/spec/unit/resource/launchd_spec.rb +8 -0
- data/spec/unit/resource/mount_spec.rb +18 -5
- data/spec/unit/resource/osx_profile_spec.rb +67 -1
- data/spec/unit/resource/powershell_package_source_spec.rb +20 -20
- data/spec/unit/resource/powershell_script_spec.rb +4 -74
- data/spec/unit/resource/rhsm_register_spec.rb +56 -18
- data/spec/unit/resource/service_spec.rb +2 -2
- data/spec/unit/resource/solaris_package_spec.rb +8 -10
- data/spec/unit/resource/windows_certificate_spec.rb +12 -0
- data/spec/unit/resource/windows_uac_spec.rb +1 -1
- data/spec/unit/resource/windows_user_privilege_spec.rb +55 -0
- data/spec/unit/resource_inspector_spec.rb +3 -3
- data/spec/unit/run_lock_spec.rb +5 -1
- data/spec/unit/runner_spec.rb +1 -2
- 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/dsc/configuration_generator_spec.rb +79 -0
- data/spec/unit/util/dsc/local_configuration_manager_spec.rb +27 -35
- data/spec/unit/util/selinux_spec.rb +2 -0
- data/tasks/rspec.rb +1 -3
- metadata +80 -33
- data/lib/chef/dist.rb +0 -68
- data/lib/chef/monkey_patches/net_http.rb +0 -22
- 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 -632
- data/lib/chef/util/powershell/cmdlet.rb +0 -173
- data/lib/chef/util/powershell/cmdlet_result.rb +0 -61
- data/spec/functional/util/powershell/cmdlet_spec.rb +0 -111
- data/spec/integration/knife/config_get_profile_spec.rb +0 -114
- data/spec/support/mock/constant.rb +0 -52
- data/spec/unit/monkey_patches/uri_spec.rb +0 -34
- 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/run_lock.rb
CHANGED
@@ -23,7 +23,7 @@ end
|
|
23
23
|
require_relative "config"
|
24
24
|
require_relative "exceptions"
|
25
25
|
require "timeout" unless defined?(Timeout)
|
26
|
-
|
26
|
+
require "chef-utils" unless defined?(ChefUtils::CANARY)
|
27
27
|
|
28
28
|
class Chef
|
29
29
|
|
@@ -96,7 +96,7 @@ class Chef
|
|
96
96
|
# Waits until acquiring the system-wide lock.
|
97
97
|
#
|
98
98
|
def wait
|
99
|
-
Chef::Log.warn("#{
|
99
|
+
Chef::Log.warn("#{ChefUtils::Dist::Infra::PRODUCT} #{runpid} is running, will wait for it to finish and then run.")
|
100
100
|
if ChefUtils.windows?
|
101
101
|
mutex.wait
|
102
102
|
else
|
@@ -173,7 +173,7 @@ class Chef
|
|
173
173
|
# Mutex name is case-sensitive contrary to other things in
|
174
174
|
# windows. "\" is the only invalid character.
|
175
175
|
def acquire_win32_mutex
|
176
|
-
@mutex = Chef::ReservedNames::Win32::Mutex.new("Global\\#{runlock_file.
|
176
|
+
@mutex = Chef::ReservedNames::Win32::Mutex.new("Global\\#{runlock_file.tr('\\', "/").downcase}")
|
177
177
|
mutex.test
|
178
178
|
end
|
179
179
|
|
data/lib/chef/search/query.rb
CHANGED
@@ -20,8 +20,10 @@ require_relative "../config"
|
|
20
20
|
require_relative "../exceptions"
|
21
21
|
require_relative "../server_api"
|
22
22
|
|
23
|
-
|
24
|
-
|
23
|
+
autoload :URI, "uri"
|
24
|
+
module Addressable
|
25
|
+
autoload :URI, "addressable/uri"
|
26
|
+
end
|
25
27
|
|
26
28
|
class Chef
|
27
29
|
class Search
|
@@ -132,10 +134,9 @@ class Chef
|
|
132
134
|
args_h
|
133
135
|
end
|
134
136
|
|
135
|
-
QUERY_PARAM_VALUE = Addressable::URI::CharacterClasses::QUERY + "\\&\\;"
|
136
|
-
|
137
137
|
def escape_value(s)
|
138
|
-
|
138
|
+
query_param_value = Addressable::URI::CharacterClasses::QUERY + "\\&\\;"
|
139
|
+
s && Addressable::URI.encode_component(s.to_s, query_param_value)
|
139
140
|
end
|
140
141
|
|
141
142
|
def create_query_string(type, query, rows, start)
|
data/lib/chef/server_api.rb
CHANGED
data/lib/chef/shell.rb
CHANGED
@@ -15,17 +15,22 @@
|
|
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)
|
22
28
|
|
23
29
|
require_relative "../chef"
|
24
30
|
require_relative "version"
|
25
31
|
require_relative "client"
|
26
32
|
require_relative "config"
|
27
33
|
require_relative "config_fetcher"
|
28
|
-
require_relative "dist"
|
29
34
|
|
30
35
|
require_relative "shell/shell_session"
|
31
36
|
require_relative "workstation_config_loader"
|
@@ -126,11 +131,11 @@ module Shell
|
|
126
131
|
irb_conf[:IRB_RC] = lambda do |conf|
|
127
132
|
m = conf.main
|
128
133
|
|
129
|
-
conf.prompt_c = "#{
|
134
|
+
conf.prompt_c = "#{ChefUtils::Dist::Infra::EXEC}#{leader(m)} > "
|
130
135
|
conf.return_format = " => %s \n"
|
131
|
-
conf.prompt_i = "#{
|
132
|
-
conf.prompt_n = "#{
|
133
|
-
conf.prompt_s = "#{
|
136
|
+
conf.prompt_i = "#{ChefUtils::Dist::Infra::EXEC}#{leader(m)} (#{Chef::VERSION})> "
|
137
|
+
conf.prompt_n = "#{ChefUtils::Dist::Infra::EXEC}#{leader(m)} ?> "
|
138
|
+
conf.prompt_s = "#{ChefUtils::Dist::Infra::EXEC}#{leader(m)}%l> "
|
134
139
|
conf.use_tracer = false
|
135
140
|
conf.instance_variable_set(:@use_multiline, false)
|
136
141
|
conf.instance_variable_set(:@use_singleline, false)
|
@@ -212,17 +217,17 @@ module Shell
|
|
212
217
|
@footer
|
213
218
|
end
|
214
219
|
|
215
|
-
banner("#{
|
220
|
+
banner("#{ChefUtils::Dist::Infra::SHELL} #{Chef::VERSION}\n\nUsage: #{ChefUtils::Dist::Infra::SHELL} [NAMED_CONF] (OPTIONS)")
|
216
221
|
|
217
222
|
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
|
-
#{
|
223
|
+
When no CONFIG is specified, #{ChefUtils::Dist::Infra::SHELL} attempts to load a default configuration file:
|
224
|
+
* 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}
|
225
|
+
* 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
|
226
|
+
* If no #{ChefUtils::Dist::Infra::SHELL_CONF} can be found, #{ChefUtils::Dist::Infra::SHELL} falls back to load:
|
227
|
+
#{ChefConfig::Config.etc_chef_dir}/client.rb if -z option is given.
|
228
|
+
#{ChefConfig::Config.etc_chef_dir}/solo.rb if --solo-legacy-mode option is given.
|
229
|
+
#{ChefUtils::Dist::Infra::USER_CONF_DIR}/config.rb if -s option is given.
|
230
|
+
#{ChefUtils::Dist::Infra::USER_CONF_DIR}/knife.rb if -s option is given.
|
226
231
|
FOOTER
|
227
232
|
|
228
233
|
option :use_multiline,
|
@@ -269,19 +274,19 @@ module Shell
|
|
269
274
|
option :solo_shell,
|
270
275
|
short: "-s",
|
271
276
|
long: "--solo",
|
272
|
-
description: "#{
|
277
|
+
description: "#{ChefUtils::Dist::Solo::PRODUCT} session",
|
273
278
|
boolean: true,
|
274
279
|
proc: proc { Chef::Config[:solo] = true }
|
275
280
|
|
276
281
|
option :client,
|
277
282
|
short: "-z",
|
278
283
|
long: "--client",
|
279
|
-
description: "#{
|
284
|
+
description: "#{ChefUtils::Dist::Infra::PRODUCT} session",
|
280
285
|
boolean: true
|
281
286
|
|
282
287
|
option :solo_legacy_shell,
|
283
288
|
long: "--solo-legacy-mode",
|
284
|
-
description: "#{
|
289
|
+
description: "#{ChefUtils::Dist::Solo::PRODUCT} legacy session",
|
285
290
|
boolean: true,
|
286
291
|
proc: proc { Chef::Config[:solo_legacy_mode] = true }
|
287
292
|
|
@@ -294,15 +299,15 @@ module Shell
|
|
294
299
|
option :chef_server_url,
|
295
300
|
short: "-S CHEFSERVERURL",
|
296
301
|
long: "--server CHEFSERVERURL",
|
297
|
-
description: "The #{
|
302
|
+
description: "The #{ChefUtils::Dist::Server::PRODUCT} URL",
|
298
303
|
proc: nil
|
299
304
|
|
300
305
|
option :version,
|
301
306
|
short: "-v",
|
302
307
|
long: "--version",
|
303
|
-
description: "Show #{
|
308
|
+
description: "Show #{ChefUtils::Dist::Infra::PRODUCT} version",
|
304
309
|
boolean: true,
|
305
|
-
proc: lambda { |v| puts "#{
|
310
|
+
proc: lambda { |v| puts "#{ChefUtils::Dist::Infra::PRODUCT}: #{::Chef::VERSION}" },
|
306
311
|
exit: 0
|
307
312
|
|
308
313
|
option :override_runlist,
|
@@ -351,18 +356,18 @@ module Shell
|
|
351
356
|
config[:config_file]
|
352
357
|
elsif environment
|
353
358
|
Shell.env = environment
|
354
|
-
config_file_to_try = ::File.join(dot_chef_dir, environment,
|
359
|
+
config_file_to_try = ::File.join(dot_chef_dir, environment, ChefUtils::Dist::Infra::SHELL_CONF)
|
355
360
|
unless ::File.exist?(config_file_to_try)
|
356
|
-
puts "could not find #{
|
361
|
+
puts "could not find #{ChefUtils::Dist::Infra::SHELL} config for environment #{environment} at #{config_file_to_try}"
|
357
362
|
exit 1
|
358
363
|
end
|
359
364
|
config_file_to_try
|
360
|
-
elsif dot_chef_dir && ::File.exist?(File.join(dot_chef_dir,
|
361
|
-
File.join(dot_chef_dir,
|
365
|
+
elsif dot_chef_dir && ::File.exist?(File.join(dot_chef_dir, ChefUtils::Dist::Infra::SHELL_CONF))
|
366
|
+
File.join(dot_chef_dir, ChefUtils::Dist::Infra::SHELL_CONF)
|
362
367
|
elsif config[:solo_legacy_shell]
|
363
|
-
Chef::Config.platform_specific_path("#{
|
368
|
+
Chef::Config.platform_specific_path("#{ChefConfig::Config.etc_chef_dir}/solo.rb")
|
364
369
|
elsif config[:client]
|
365
|
-
Chef::Config.platform_specific_path("#{
|
370
|
+
Chef::Config.platform_specific_path("#{ChefConfig::Config.etc_chef_dir}/client.rb")
|
366
371
|
elsif config[:solo_shell]
|
367
372
|
Chef::WorkstationConfigLoader.new(nil, Chef::Log).config_location
|
368
373
|
else
|
data/lib/chef/shell/ext.rb
CHANGED
@@ -25,7 +25,7 @@ require_relative "shell_session"
|
|
25
25
|
require_relative "model_wrapper"
|
26
26
|
require_relative "../server_api"
|
27
27
|
require_relative "../json_compat"
|
28
|
-
|
28
|
+
require "chef-utils/dist" unless defined?(ChefUtils::Dist)
|
29
29
|
|
30
30
|
module Shell
|
31
31
|
module Extensions
|
@@ -62,14 +62,14 @@ module Shell
|
|
62
62
|
if subsession = jobs.select_shell_session(context_obj)
|
63
63
|
jobs.switch(subsession)
|
64
64
|
else
|
65
|
-
irb(context_obj)
|
65
|
+
irb(context_obj) # rubocop: disable Lint/Debugger
|
66
66
|
end
|
67
67
|
end
|
68
68
|
|
69
69
|
def help_banner
|
70
70
|
banner = []
|
71
71
|
banner << ""
|
72
|
-
banner << "#{
|
72
|
+
banner << "#{ChefUtils::Dist::Infra::SHELL} Help"
|
73
73
|
banner << "".ljust(80, "=")
|
74
74
|
banner << "| " + "Command".ljust(25) + "| " + "Description"
|
75
75
|
banner << "".ljust(80, "=")
|
@@ -194,7 +194,7 @@ module Shell
|
|
194
194
|
explain(<<~E)
|
195
195
|
## SUMMARY ##
|
196
196
|
When called with no argument, +help+ prints a table of all
|
197
|
-
#{
|
197
|
+
#{ChefUtils::Dist::Infra::SHELL} commands. When called with an argument COMMAND, +help+
|
198
198
|
prints a detailed explanation of the command if available, or the
|
199
199
|
description if no explanation is available.
|
200
200
|
E
|
@@ -208,9 +208,9 @@ module Shell
|
|
208
208
|
end
|
209
209
|
alias :halp :help
|
210
210
|
|
211
|
-
desc "prints information about #{
|
211
|
+
desc "prints information about #{ChefUtils::Dist::Infra::PRODUCT}"
|
212
212
|
def version
|
213
|
-
puts "Welcome to the #{
|
213
|
+
puts "Welcome to the #{ChefUtils::Dist::Infra::SHELL} #{::Chef::VERSION}\n" +
|
214
214
|
"For usage see https://docs.chef.io/chef_shell/"
|
215
215
|
:ucanhaz_automation
|
216
216
|
end
|
@@ -228,7 +228,7 @@ module Shell
|
|
228
228
|
:attributes
|
229
229
|
end
|
230
230
|
|
231
|
-
desc "run #{
|
231
|
+
desc "run #{ChefUtils::Dist::Infra::PRODUCT} using the current recipe"
|
232
232
|
def run_chef
|
233
233
|
Chef::Log.level = :debug
|
234
234
|
session = Shell.session
|
@@ -237,8 +237,8 @@ module Shell
|
|
237
237
|
runrun
|
238
238
|
end
|
239
239
|
|
240
|
-
desc "returns an object to control a paused #{
|
241
|
-
subcommands resume: "resume the #{
|
240
|
+
desc "returns an object to control a paused #{ChefUtils::Dist::Infra::PRODUCT} run"
|
241
|
+
subcommands resume: "resume the #{ChefUtils::Dist::Infra::PRODUCT} run",
|
242
242
|
step: "run only the next resource",
|
243
243
|
skip_back: "move back in the run list",
|
244
244
|
skip_forward: "move forward in the run list"
|
@@ -309,9 +309,9 @@ module Shell
|
|
309
309
|
new_node = edit(existing_node)
|
310
310
|
|
311
311
|
## EDITOR SELECTION ##
|
312
|
-
#{
|
312
|
+
#{ChefUtils::Dist::Infra::SHELL} looks for an editor using the following logic
|
313
313
|
1. Looks for an EDITOR set by Shell.editor = "EDITOR"
|
314
|
-
2. Looks for an EDITOR configured in your #{
|
314
|
+
2. Looks for an EDITOR configured in your #{ChefUtils::Dist::Infra::SHELL} config file
|
315
315
|
3. Uses the value of the EDITOR environment variable
|
316
316
|
E
|
317
317
|
def edit(object)
|
@@ -320,7 +320,7 @@ module Shell
|
|
320
320
|
return :failburger
|
321
321
|
end
|
322
322
|
|
323
|
-
filename = "#{
|
323
|
+
filename = "#{ChefUtils::Dist::Infra::SHELL}-edit-#{object.class.name}-"
|
324
324
|
if object.respond_to?(:name)
|
325
325
|
filename += object.name
|
326
326
|
elsif object.respond_to?(:id)
|
@@ -28,7 +28,7 @@ require_relative "../run_list/run_list_expansion"
|
|
28
28
|
require_relative "../formatters/base"
|
29
29
|
require_relative "../formatters/doc"
|
30
30
|
require_relative "../formatters/minimal"
|
31
|
-
|
31
|
+
require "chef-utils/dist" unless defined?(ChefUtils::Dist)
|
32
32
|
|
33
33
|
module Shell
|
34
34
|
class ShellSession
|
@@ -90,7 +90,7 @@ module Shell
|
|
90
90
|
end
|
91
91
|
|
92
92
|
def save_node
|
93
|
-
raise "Not Supported! #{self.class.name} doesn't support #save_node, maybe you need to run #{
|
93
|
+
raise "Not Supported! #{self.class.name} doesn't support #save_node, maybe you need to run #{ChefUtils::Dist::Infra::SHELL} in client mode?"
|
94
94
|
end
|
95
95
|
|
96
96
|
def rebuild_context
|
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
|
data/lib/chef/util/diff.rb
CHANGED
@@ -40,9 +40,6 @@
|
|
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
|
@@ -86,6 +83,9 @@ class Chef
|
|
86
83
|
# produces a unified-output-format diff with 3 lines of context
|
87
84
|
# ChefFS uses udiff() directly
|
88
85
|
def udiff(old_file, new_file)
|
86
|
+
require "diff/lcs"
|
87
|
+
require "diff/lcs/hunk"
|
88
|
+
|
89
89
|
diff_str = ""
|
90
90
|
file_length_difference = 0
|
91
91
|
|