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
@@ -15,9 +15,9 @@
|
|
15
15
|
#
|
16
16
|
|
17
17
|
require_relative "../resource"
|
18
|
-
|
18
|
+
require "chef-utils/dist" unless defined?(ChefUtils::Dist)
|
19
19
|
require_relative "helpers/cron_validations"
|
20
|
-
require "digest/md5"
|
20
|
+
require "digest/md5" unless defined?(Digest::MD5)
|
21
21
|
|
22
22
|
class Chef
|
23
23
|
class Resource
|
@@ -26,29 +26,29 @@ class Chef
|
|
26
26
|
|
27
27
|
provides :chef_client_cron
|
28
28
|
|
29
|
-
description "Use the **chef_client_cron** resource to setup the #{
|
29
|
+
description "Use the **chef_client_cron** resource to setup the #{ChefUtils::Dist::Infra::PRODUCT} to run as a cron job. This resource will also create the specified log directory if it doesn't already exist."
|
30
30
|
introduced "16.0"
|
31
31
|
examples <<~DOC
|
32
|
-
**Setup #{
|
32
|
+
**Setup #{ChefUtils::Dist::Infra::PRODUCT} to run using the default 30 minute cadence**:
|
33
33
|
|
34
34
|
```ruby
|
35
|
-
chef_client_cron
|
35
|
+
chef_client_cron 'Run #{ChefUtils::Dist::Infra::PRODUCT} as a cron job'
|
36
36
|
```
|
37
37
|
|
38
|
-
**Run #{
|
38
|
+
**Run #{ChefUtils::Dist::Infra::PRODUCT} twice a day**:
|
39
39
|
|
40
40
|
```ruby
|
41
|
-
chef_client_cron
|
41
|
+
chef_client_cron 'Run #{ChefUtils::Dist::Infra::PRODUCT} every 12 hours' do
|
42
42
|
minute 0
|
43
|
-
hour
|
43
|
+
hour '0,12'
|
44
44
|
end
|
45
45
|
```
|
46
46
|
|
47
|
-
**Run #{
|
47
|
+
**Run #{ChefUtils::Dist::Infra::PRODUCT} with extra options passed to the client**:
|
48
48
|
|
49
49
|
```ruby
|
50
|
-
chef_client_cron
|
51
|
-
daemon_options [
|
50
|
+
chef_client_cron 'Run an override recipe' do
|
51
|
+
daemon_options ['--override-runlist mycorp_base::default']
|
52
52
|
end
|
53
53
|
```
|
54
54
|
DOC
|
@@ -56,42 +56,42 @@ class Chef
|
|
56
56
|
extend Chef::ResourceHelpers::CronValidations
|
57
57
|
|
58
58
|
property :job_name, String,
|
59
|
-
default:
|
59
|
+
default: ChefUtils::Dist::Infra::CLIENT,
|
60
60
|
description: "The name of the cron job to create."
|
61
61
|
|
62
62
|
property :comment, String,
|
63
63
|
description: "A comment to place in the cron.d file."
|
64
64
|
|
65
65
|
property :user, String,
|
66
|
-
description: "The name of the user that #{
|
66
|
+
description: "The name of the user that #{ChefUtils::Dist::Infra::PRODUCT} runs as.",
|
67
67
|
default: "root"
|
68
68
|
|
69
69
|
property :minute, [Integer, String],
|
70
|
-
description: "The minute at which #{
|
70
|
+
description: "The minute at which #{ChefUtils::Dist::Infra::PRODUCT} is to run (0 - 59) or a cron pattern such as '0,30'.",
|
71
71
|
default: "0,30", callbacks: {
|
72
72
|
"should be a valid minute spec" => method(:validate_minute),
|
73
73
|
}
|
74
74
|
|
75
75
|
property :hour, [Integer, String],
|
76
|
-
description: "The hour at which #{
|
76
|
+
description: "The hour at which #{ChefUtils::Dist::Infra::PRODUCT} is to run (0 - 23) or a cron pattern such as '0,12'.",
|
77
77
|
default: "*", callbacks: {
|
78
78
|
"should be a valid hour spec" => method(:validate_hour),
|
79
79
|
}
|
80
80
|
|
81
81
|
property :day, [Integer, String],
|
82
|
-
description: "The day of month at which #{
|
82
|
+
description: "The day of month at which #{ChefUtils::Dist::Infra::PRODUCT} is to run (1 - 31) or a cron pattern such as '1,7,14,21,28'.",
|
83
83
|
default: "*", callbacks: {
|
84
84
|
"should be a valid day spec" => method(:validate_day),
|
85
85
|
}
|
86
86
|
|
87
87
|
property :month, [Integer, String],
|
88
|
-
description: "The month in the year on which #{
|
88
|
+
description: "The month in the year on which #{ChefUtils::Dist::Infra::PRODUCT} is to run (1 - 12, jan-dec, or *).",
|
89
89
|
default: "*", callbacks: {
|
90
90
|
"should be a valid month spec" => method(:validate_month),
|
91
91
|
}
|
92
92
|
|
93
93
|
property :weekday, [Integer, String],
|
94
|
-
description: "The day of the week on which #{
|
94
|
+
description: "The day of the week on which #{ChefUtils::Dist::Infra::PRODUCT} is to run (0-7, mon-sun, or *), where Sunday is both 0 and 7.",
|
95
95
|
default: "*", callbacks: {
|
96
96
|
"should be a valid weekday spec" => method(:validate_dow),
|
97
97
|
}
|
@@ -100,7 +100,7 @@ class Chef
|
|
100
100
|
default: 300,
|
101
101
|
coerce: proc { |x| Integer(x) },
|
102
102
|
callbacks: { "should be a positive number" => proc { |v| v > 0 } },
|
103
|
-
description: "A random number of seconds between 0 and X to add to interval so that all #{
|
103
|
+
description: "A random number of seconds between 0 and X to add to interval so that all #{ChefUtils::Dist::Infra::CLIENT} commands don't execute at the same time."
|
104
104
|
|
105
105
|
property :mailto, String,
|
106
106
|
description: "The e-mail address to e-mail any cron task failures to."
|
@@ -110,12 +110,12 @@ class Chef
|
|
110
110
|
default: false
|
111
111
|
|
112
112
|
property :config_directory, String,
|
113
|
-
default:
|
113
|
+
default: ChefConfig::Config.etc_chef_dir,
|
114
114
|
description: "The path of the config directory."
|
115
115
|
|
116
116
|
property :log_directory, String,
|
117
|
-
default: lazy { platform?("mac_os_x") ? "/Library/Logs/#{
|
118
|
-
default_description: "/Library/Logs/#{
|
117
|
+
default: lazy { platform?("mac_os_x") ? "/Library/Logs/#{ChefUtils::Dist::Infra::DIR_SUFFIX.capitalize}" : "/var/log/#{ChefUtils::Dist::Infra::DIR_SUFFIX}" },
|
118
|
+
default_description: "/Library/Logs/#{ChefUtils::Dist::Infra::DIR_SUFFIX.capitalize} on macOS and /var/log/#{ChefUtils::Dist::Infra::DIR_SUFFIX} otherwise",
|
119
119
|
description: "The path of the directory to create the log file in."
|
120
120
|
|
121
121
|
property :log_file_name, String,
|
@@ -127,17 +127,23 @@ class Chef
|
|
127
127
|
description: "Append to the log file instead of overwriting the log file on each run."
|
128
128
|
|
129
129
|
property :chef_binary_path, String,
|
130
|
-
default: "/opt/#{
|
131
|
-
description: "The path to the #{
|
130
|
+
default: "/opt/#{ChefUtils::Dist::Infra::DIR_SUFFIX}/bin/#{ChefUtils::Dist::Infra::CLIENT}",
|
131
|
+
description: "The path to the #{ChefUtils::Dist::Infra::CLIENT} binary."
|
132
132
|
|
133
133
|
property :daemon_options, Array,
|
134
134
|
default: lazy { [] },
|
135
|
-
description: "An array of options to pass to the #{
|
135
|
+
description: "An array of options to pass to the #{ChefUtils::Dist::Infra::CLIENT} command."
|
136
136
|
|
137
137
|
property :environment, Hash,
|
138
138
|
default: lazy { {} },
|
139
139
|
description: "A Hash containing additional arbitrary environment variables under which the cron job will be run in the form of `({'ENV_VARIABLE' => 'VALUE'})`."
|
140
140
|
|
141
|
+
property :nice, [Integer, String],
|
142
|
+
description: "The process priority to run the #{ChefUtils::Dist::Infra::CLIENT} process at. A value of -20 is the highest priority and 19 is the lowest priority.",
|
143
|
+
introduced: "16.5",
|
144
|
+
coerce: proc { |x| Integer(x) },
|
145
|
+
callbacks: { "should be an Integer between -20 and 19" => proc { |v| v >= -20 && v <= 19 } }
|
146
|
+
|
141
147
|
action :add do
|
142
148
|
# TODO: Replace this with a :create_if_missing action on directory when that exists
|
143
149
|
unless ::Dir.exist?(new_resource.log_directory)
|
@@ -158,7 +164,7 @@ class Chef
|
|
158
164
|
mailto new_resource.mailto if new_resource.mailto
|
159
165
|
user new_resource.user
|
160
166
|
comment new_resource.comment if new_resource.comment
|
161
|
-
command
|
167
|
+
command client_command
|
162
168
|
end
|
163
169
|
end
|
164
170
|
|
@@ -187,15 +193,16 @@ class Chef
|
|
187
193
|
#
|
188
194
|
# @return [String]
|
189
195
|
#
|
190
|
-
def
|
196
|
+
def client_command
|
191
197
|
cmd = ""
|
192
198
|
cmd << "/bin/sleep #{splay_sleep_time(new_resource.splay)}; "
|
199
|
+
cmd << "#{which("nice")} -n #{new_resource.nice} " if new_resource.nice
|
193
200
|
cmd << "#{new_resource.chef_binary_path} "
|
194
201
|
cmd << "#{new_resource.daemon_options.join(" ")} " unless new_resource.daemon_options.empty?
|
195
202
|
cmd << "-c #{::File.join(new_resource.config_directory, "client.rb")} "
|
196
203
|
cmd << "--chef-license accept " if new_resource.accept_chef_license
|
197
204
|
cmd << log_command
|
198
|
-
cmd << " || echo \"#{
|
205
|
+
cmd << " || echo \"#{ChefUtils::Dist::Infra::PRODUCT} execution failed\"" if new_resource.mailto
|
199
206
|
cmd
|
200
207
|
end
|
201
208
|
|
@@ -0,0 +1,194 @@
|
|
1
|
+
#
|
2
|
+
# Copyright:: Copyright (c) Chef Software Inc.
|
3
|
+
#
|
4
|
+
# Licensed under the Apache License, Version 2.0 (the "License");
|
5
|
+
# you may not use this file except in compliance with the License.
|
6
|
+
# You may obtain a copy of the License at
|
7
|
+
#
|
8
|
+
# http://www.apache.org/licenses/LICENSE-2.0
|
9
|
+
#
|
10
|
+
# Unless required by applicable law or agreed to in writing, software
|
11
|
+
# distributed under the License is distributed on an "AS IS" BASIS,
|
12
|
+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
13
|
+
# See the License for the specific language governing permissions and
|
14
|
+
# limitations under the License.
|
15
|
+
#
|
16
|
+
|
17
|
+
require_relative "../resource"
|
18
|
+
require "chef-utils/dist" unless defined?(ChefUtils::Dist)
|
19
|
+
class Chef
|
20
|
+
class Resource
|
21
|
+
class ChefClientLaunchd < Chef::Resource
|
22
|
+
unified_mode true
|
23
|
+
|
24
|
+
provides :chef_client_launchd
|
25
|
+
|
26
|
+
description "Use the **chef_client_launchd** resource to configure the #{ChefUtils::Dist::Infra::PRODUCT} to run on a schedule."
|
27
|
+
introduced "16.5"
|
28
|
+
examples <<~DOC
|
29
|
+
**Set the #{ChefUtils::Dist::Infra::PRODUCT} to run on a schedule**:
|
30
|
+
|
31
|
+
```ruby
|
32
|
+
chef_client_launchd 'Setup the #{ChefUtils::Dist::Infra::PRODUCT} to run every 30 minutes' do
|
33
|
+
interval 30
|
34
|
+
action :enable
|
35
|
+
end
|
36
|
+
```
|
37
|
+
|
38
|
+
**Disable the #{ChefUtils::Dist::Infra::PRODUCT} running on a schedule**:
|
39
|
+
|
40
|
+
```ruby
|
41
|
+
chef_client_launchd 'Prevent the #{ChefUtils::Dist::Infra::PRODUCT} from running on a schedule' do
|
42
|
+
action :disable
|
43
|
+
end
|
44
|
+
```
|
45
|
+
DOC
|
46
|
+
|
47
|
+
property :user, String,
|
48
|
+
description: "The name of the user that #{ChefUtils::Dist::Infra::PRODUCT} runs as.",
|
49
|
+
default: "root"
|
50
|
+
|
51
|
+
property :working_directory, String,
|
52
|
+
description: "The working directory to run the #{ChefUtils::Dist::Infra::PRODUCT} from.",
|
53
|
+
default: "/var/root"
|
54
|
+
|
55
|
+
property :interval, [Integer, String],
|
56
|
+
description: "Time in minutes between #{ChefUtils::Dist::Infra::PRODUCT} executions.",
|
57
|
+
coerce: proc { |x| Integer(x) },
|
58
|
+
callbacks: { "should be a positive number" => proc { |v| v > 0 } },
|
59
|
+
default: 30
|
60
|
+
|
61
|
+
property :splay, [Integer, String],
|
62
|
+
default: 300,
|
63
|
+
coerce: proc { |x| Integer(x) },
|
64
|
+
callbacks: { "should be a positive number" => proc { |v| v > 0 } },
|
65
|
+
description: "A random number of seconds between 0 and X to add to interval so that all #{ChefUtils::Dist::Infra::CLIENT} commands don't execute at the same time."
|
66
|
+
|
67
|
+
property :accept_chef_license, [true, false],
|
68
|
+
description: "Accept the Chef Online Master License and Services Agreement. See <https://www.chef.io/online-master-agreement/>",
|
69
|
+
default: false
|
70
|
+
|
71
|
+
property :config_directory, String,
|
72
|
+
description: "The path of the config directory.",
|
73
|
+
default: ChefConfig::Config.etc_chef_dir
|
74
|
+
|
75
|
+
property :log_directory, String,
|
76
|
+
description: "The path of the directory to create the log file in.",
|
77
|
+
default: "/Library/Logs/Chef"
|
78
|
+
|
79
|
+
property :log_file_name, String,
|
80
|
+
description: "The name of the log file to use.",
|
81
|
+
default: "client.log"
|
82
|
+
|
83
|
+
property :chef_binary_path, String,
|
84
|
+
description: "The path to the #{ChefUtils::Dist::Infra::CLIENT} binary.",
|
85
|
+
default: "/opt/#{ChefUtils::Dist::Infra::DIR_SUFFIX}/bin/#{ChefUtils::Dist::Infra::CLIENT}"
|
86
|
+
|
87
|
+
property :daemon_options, Array,
|
88
|
+
description: "An array of options to pass to the #{ChefUtils::Dist::Infra::CLIENT} command.",
|
89
|
+
default: lazy { [] }
|
90
|
+
|
91
|
+
property :environment, Hash,
|
92
|
+
description: "A Hash containing additional arbitrary environment variables under which the launchd daemon will be run in the form of `({'ENV_VARIABLE' => 'VALUE'})`.",
|
93
|
+
default: lazy { {} }
|
94
|
+
|
95
|
+
property :nice, [Integer, String],
|
96
|
+
description: "The process priority to run the #{ChefUtils::Dist::Infra::CLIENT} process at. A value of -20 is the highest priority and 19 is the lowest priority.",
|
97
|
+
coerce: proc { |x| Integer(x) },
|
98
|
+
callbacks: { "should be an Integer between -20 and 19" => proc { |v| v >= -20 && v <= 19 } }
|
99
|
+
|
100
|
+
property :low_priority_io, [true, false],
|
101
|
+
description: "Run the #{ChefUtils::Dist::Infra::CLIENT} process with low priority disk IO",
|
102
|
+
default: true
|
103
|
+
|
104
|
+
action :enable do
|
105
|
+
unless ::Dir.exist?(new_resource.log_directory)
|
106
|
+
directory new_resource.log_directory do
|
107
|
+
owner new_resource.user
|
108
|
+
mode "0750"
|
109
|
+
recursive true
|
110
|
+
end
|
111
|
+
end
|
112
|
+
|
113
|
+
launchd "com.#{ChefUtils::Dist::Infra::SHORT}.#{ChefUtils::Dist::Infra::CLIENT}" do
|
114
|
+
username new_resource.user
|
115
|
+
working_directory new_resource.working_directory
|
116
|
+
start_interval new_resource.interval * 60
|
117
|
+
program_arguments ["/bin/bash", "-c", client_command]
|
118
|
+
environment_variables new_resource.environment unless new_resource.environment.empty?
|
119
|
+
nice new_resource.nice
|
120
|
+
low_priority_io true
|
121
|
+
notifies :sleep, "chef_sleep[Sleep before client restart]", :immediately
|
122
|
+
action :create # create only creates the file. No service restart triggering
|
123
|
+
end
|
124
|
+
|
125
|
+
# Launchd doesn't have the concept of a reload aka restart. Instead to update a daemon config you have
|
126
|
+
# to unload it and then reload the new plist. That's usually fine, but not if chef-client is trying
|
127
|
+
# to restart itself. If the chef-client process uses launchd or macosx_service resources to restart itself
|
128
|
+
# we'll end up with a stopped service that will never get started back up. Instead we use this daemon
|
129
|
+
# that triggers when the chef-client plist file is updated, and handles the restart outside the run.
|
130
|
+
launchd "com.#{ChefUtils::Dist::Infra::SHORT}.restarter" do
|
131
|
+
username "root"
|
132
|
+
watch_paths ["/Library/LaunchDaemons/com.#{ChefUtils::Dist::Infra::SHORT}.#{ChefUtils::Dist::Infra::CLIENT}.plist"]
|
133
|
+
standard_out_path ::File.join(new_resource.log_directory, new_resource.log_file_name)
|
134
|
+
standard_error_path ::File.join(new_resource.log_directory, new_resource.log_file_name)
|
135
|
+
program_arguments ["/bin/bash",
|
136
|
+
"-c",
|
137
|
+
"echo; echo #{ChefUtils::Dist::Infra::PRODUCT} launchd daemon config has been updated. Manually unloading and reloading the daemon; echo Now unloading the daemon; launchctl unload /Library/LaunchDaemons/com.#{ChefUtils::Dist::Infra::SHORT}.#{ChefUtils::Dist::Infra::CLIENT}.plist; sleep 2; echo Now loading the daemon; launchctl load /Library/LaunchDaemons/com.#{ChefUtils::Dist::Infra::SHORT}.#{ChefUtils::Dist::Infra::CLIENT}.plist"]
|
138
|
+
action :enable # enable creates the plist & triggers service restarts on change
|
139
|
+
end
|
140
|
+
|
141
|
+
# We want to make sure that after we update the chef-client launchd config that we don't move on to another recipe
|
142
|
+
# before the restarter daemon can do its thing. This sleep avoids killing the client while it's doing something like
|
143
|
+
# installing a package, which could be problematic. It also makes it a bit more clear in the log that the killed process
|
144
|
+
# was intentional.
|
145
|
+
chef_sleep "Sleep before client restart" do
|
146
|
+
seconds 10
|
147
|
+
action :nothing
|
148
|
+
end
|
149
|
+
end
|
150
|
+
|
151
|
+
action :disable do
|
152
|
+
service ChefUtils::Dist::Infra::PRODUCT do
|
153
|
+
service_name "com.#{ChefUtils::Dist::Infra::SHORT}.#{ChefUtils::Dist::Infra::CLIENT}"
|
154
|
+
action :disable
|
155
|
+
end
|
156
|
+
|
157
|
+
service "com.#{ChefUtils::Dist::Infra::SHORT}.restarter" do
|
158
|
+
action :disable
|
159
|
+
end
|
160
|
+
end
|
161
|
+
|
162
|
+
action_class do
|
163
|
+
#
|
164
|
+
# Generate a uniformly distributed unique number to sleep from 0 to the splay time
|
165
|
+
#
|
166
|
+
# @param [Integer] splay The number of seconds to splay
|
167
|
+
#
|
168
|
+
# @return [Integer]
|
169
|
+
#
|
170
|
+
def splay_sleep_time(splay)
|
171
|
+
seed = node["shard_seed"] || Digest::MD5.hexdigest(node.name).to_s.hex
|
172
|
+
random = Random.new(seed.to_i)
|
173
|
+
random.rand(splay)
|
174
|
+
end
|
175
|
+
|
176
|
+
#
|
177
|
+
# random sleep time + chef-client + daemon option properties + license acceptance
|
178
|
+
#
|
179
|
+
# @return [String]
|
180
|
+
#
|
181
|
+
def client_command
|
182
|
+
cmd = ""
|
183
|
+
cmd << "/bin/sleep #{splay_sleep_time(new_resource.splay)};"
|
184
|
+
cmd << " #{new_resource.chef_binary_path}"
|
185
|
+
cmd << " #{new_resource.daemon_options.join(" ")}" unless new_resource.daemon_options.empty?
|
186
|
+
cmd << " -c #{::File.join(new_resource.config_directory, "client.rb")}"
|
187
|
+
cmd << " -L #{::File.join(new_resource.log_directory, new_resource.log_file_name)}"
|
188
|
+
cmd << " --chef-license accept" if new_resource.accept_chef_license
|
189
|
+
cmd
|
190
|
+
end
|
191
|
+
end
|
192
|
+
end
|
193
|
+
end
|
194
|
+
end
|
@@ -15,7 +15,7 @@
|
|
15
15
|
#
|
16
16
|
|
17
17
|
require_relative "../resource"
|
18
|
-
|
18
|
+
require "chef-utils/dist" unless defined?(ChefUtils::Dist)
|
19
19
|
|
20
20
|
class Chef
|
21
21
|
class Resource
|
@@ -24,35 +24,35 @@ class Chef
|
|
24
24
|
|
25
25
|
provides :chef_client_scheduled_task
|
26
26
|
|
27
|
-
description "Use the **chef_client_scheduled_task** resource to setup the #{
|
27
|
+
description "Use the **chef_client_scheduled_task** resource to setup the #{ChefUtils::Dist::Infra::PRODUCT} to run as a Windows scheduled task. This resource will also create the specified log directory if it doesn't already exist."
|
28
28
|
introduced "16.0"
|
29
29
|
examples <<~DOC
|
30
|
-
**Setup #{
|
30
|
+
**Setup #{ChefUtils::Dist::Infra::PRODUCT} to run using the default 30 minute cadence**:
|
31
31
|
|
32
32
|
```ruby
|
33
|
-
chef_client_scheduled_task
|
33
|
+
chef_client_scheduled_task 'Run #{ChefUtils::Dist::Infra::PRODUCT} as a scheduled task'
|
34
34
|
```
|
35
35
|
|
36
|
-
**Run #{
|
36
|
+
**Run #{ChefUtils::Dist::Infra::PRODUCT} on system start**:
|
37
37
|
|
38
38
|
```ruby
|
39
|
-
chef_client_scheduled_task '#{
|
39
|
+
chef_client_scheduled_task '#{ChefUtils::Dist::Infra::PRODUCT} on start' do
|
40
40
|
frequency 'onstart'
|
41
41
|
end
|
42
42
|
```
|
43
43
|
|
44
|
-
**Run #{
|
44
|
+
**Run #{ChefUtils::Dist::Infra::PRODUCT} with extra options passed to the client**:
|
45
45
|
|
46
46
|
```ruby
|
47
|
-
chef_client_scheduled_task
|
48
|
-
daemon_options [
|
47
|
+
chef_client_scheduled_task 'Run an override recipe' do
|
48
|
+
daemon_options ['--override-runlist mycorp_base::default']
|
49
49
|
end
|
50
50
|
```
|
51
51
|
|
52
|
-
**Run #{
|
52
|
+
**Run #{ChefUtils::Dist::Infra::PRODUCT} daily at 01:00 am, specifying a named run-list**:
|
53
53
|
|
54
54
|
```ruby
|
55
|
-
chef_client_scheduled_task
|
55
|
+
chef_client_scheduled_task 'Run chef-client named run-list daily' do
|
56
56
|
frequency 'daily'
|
57
57
|
start_time '01:00'
|
58
58
|
daemon_options ['-n audit_only']
|
@@ -64,14 +64,15 @@ class Chef
|
|
64
64
|
|
65
65
|
property :task_name, String,
|
66
66
|
description: "The name of the scheduled task to create.",
|
67
|
-
default:
|
67
|
+
default: ChefUtils::Dist::Infra::CLIENT
|
68
68
|
|
69
69
|
property :user, String,
|
70
|
-
description: "The name of the user that #{
|
70
|
+
description: "The name of the user that #{ChefUtils::Dist::Infra::PRODUCT} runs as.",
|
71
71
|
default: "System", sensitive: true
|
72
72
|
|
73
|
-
property :password, String,
|
74
|
-
description: "The password for the user that #{
|
73
|
+
property :password, String,
|
74
|
+
description: "The password for the user that #{ChefUtils::Dist::Infra::PRODUCT} runs as.",
|
75
|
+
sensitive: true
|
75
76
|
|
76
77
|
property :frequency, String,
|
77
78
|
description: "Frequency with which to run the task.",
|
@@ -100,16 +101,16 @@ class Chef
|
|
100
101
|
property :splay, [Integer, String],
|
101
102
|
coerce: proc { |x| Integer(x) },
|
102
103
|
callbacks: { "should be a positive number" => proc { |v| v > 0 } },
|
103
|
-
description: "A random number of seconds between 0 and X to add to interval so that all #{
|
104
|
+
description: "A random number of seconds between 0 and X to add to interval so that all #{ChefUtils::Dist::Infra::CLIENT} commands don't execute at the same time.",
|
104
105
|
default: 300
|
105
106
|
|
106
107
|
property :run_on_battery, [true, false],
|
107
|
-
description: "Run the #{
|
108
|
+
description: "Run the #{ChefUtils::Dist::Infra::PRODUCT} task when the system is on batteries.",
|
108
109
|
default: true
|
109
110
|
|
110
111
|
property :config_directory, String,
|
111
112
|
description: "The path of the config directory.",
|
112
|
-
default:
|
113
|
+
default: ChefConfig::Config.etc_chef_dir
|
113
114
|
|
114
115
|
property :log_directory, String,
|
115
116
|
description: "The path of the directory to create the log file in.",
|
@@ -121,11 +122,11 @@ class Chef
|
|
121
122
|
default: "client.log"
|
122
123
|
|
123
124
|
property :chef_binary_path, String,
|
124
|
-
description: "The path to the #{
|
125
|
-
default: "C:/#{
|
125
|
+
description: "The path to the #{ChefUtils::Dist::Infra::CLIENT} binary.",
|
126
|
+
default: "C:/#{ChefUtils::Dist::Org::LEGACY_CONF_DIR}/#{ChefUtils::Dist::Infra::DIR_SUFFIX}/bin/#{ChefUtils::Dist::Infra::CLIENT}"
|
126
127
|
|
127
128
|
property :daemon_options, Array,
|
128
|
-
description: "An array of options to pass to the #{
|
129
|
+
description: "An array of options to pass to the #{ChefUtils::Dist::Infra::CLIENT} command.",
|
129
130
|
default: lazy { [] }
|
130
131
|
|
131
132
|
action :add do
|
@@ -175,9 +176,11 @@ class Chef
|
|
175
176
|
"#{cmd_path} /c \"#{client_cmd}\""
|
176
177
|
end
|
177
178
|
|
179
|
+
#
|
178
180
|
# Build command line to pass to cmd.exe
|
179
181
|
#
|
180
182
|
# @return [String]
|
183
|
+
#
|
181
184
|
def client_cmd
|
182
185
|
cmd = new_resource.chef_binary_path.dup
|
183
186
|
cmd << " -L #{::File.join(new_resource.log_directory, new_resource.log_file_name)}"
|