chef 16.4.38 → 16.7.61
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/Gemfile +5 -12
- data/Rakefile +22 -15
- data/bin/knife +1 -1
- data/chef-universal-mingw32.gemspec +1 -1
- data/chef.gemspec +2 -1
- data/lib/chef/application.rb +19 -17
- data/lib/chef/application/apply.rb +12 -7
- data/lib/chef/application/base.rb +26 -23
- 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 +13 -43
- 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 +1 -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/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 +5 -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 +1 -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/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 +4 -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 +1 -1
- 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 +18 -3
- 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 +22 -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/policy_builder/dynamic.rb +2 -0
- data/lib/chef/policy_builder/policyfile.rb +2 -2
- data/lib/chef/powershell.rb +8 -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/file.rb +2 -2
- 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 +2 -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 +4 -4
- 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 +2 -2
- data/lib/chef/resource/timezone.rb +112 -73
- 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 +12 -10
- 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 +1 -5
- 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/lcm_output_parser.rb +1 -3
- data/lib/chef/util/dsc/local_configuration_manager.rb +1 -1
- data/lib/chef/util/powershell/cmdlet.rb +6 -10
- 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/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 +3 -3
- 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 +4 -4
- data/spec/integration/client/exit_code_spec.rb +3 -2
- data/spec/integration/client/ipv6_spec.rb +1 -1
- 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/remote_directory.rb +1 -1
- data/spec/integration/solo/solo_spec.rb +5 -5
- data/spec/spec_helper.rb +8 -6
- 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 +16 -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/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/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 +39 -2
- 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/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_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/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/timezone_spec.rb +63 -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/selinux_spec.rb +2 -0
- data/tasks/rspec.rb +1 -3
- metadata +49 -27
- 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/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
@@ -1,61 +0,0 @@
|
|
1
|
-
#
|
2
|
-
# Author:: Nimisha Sharad (<nimisha.sharad@msystechnologies.com>)
|
3
|
-
# Copyright:: Copyright (c) Chef Software Inc.
|
4
|
-
# License:: Apache License, Version 2.0
|
5
|
-
#
|
6
|
-
# Licensed under the Apache License, Version 2.0 (the "License");
|
7
|
-
# you may not use this file except in compliance with the License.
|
8
|
-
# You may obtain a copy of the License at
|
9
|
-
#
|
10
|
-
# http://www.apache.org/licenses/LICENSE-2.0
|
11
|
-
#
|
12
|
-
# Unless required by applicable law or agreed to in writing, software
|
13
|
-
# distributed under the License is distributed on an "AS IS" BASIS,
|
14
|
-
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
15
|
-
# See the License for the specific language governing permissions and
|
16
|
-
# limitations under the License.
|
17
|
-
#
|
18
|
-
|
19
|
-
require_relative "../mixin/windows_env_helper" if ChefUtils.windows?
|
20
|
-
require_relative "../mixin/wide_string"
|
21
|
-
require_relative "../exceptions"
|
22
|
-
|
23
|
-
class Chef
|
24
|
-
class Provider
|
25
|
-
class WindowsPath < Chef::Provider
|
26
|
-
include Chef::Mixin::WindowsEnvHelper if ChefUtils.windows?
|
27
|
-
|
28
|
-
provides :windows_path
|
29
|
-
|
30
|
-
def load_current_resource
|
31
|
-
@current_resource = Chef::Resource::WindowsPath.new(new_resource.name)
|
32
|
-
@current_resource.path(new_resource.path)
|
33
|
-
@current_resource
|
34
|
-
end
|
35
|
-
|
36
|
-
action :add do
|
37
|
-
# The windows Env provider does not correctly expand variables in
|
38
|
-
# the PATH environment variable. Ruby expects these to be expanded.
|
39
|
-
#
|
40
|
-
path = expand_path(new_resource.path)
|
41
|
-
declare_resource(:env, "path") do
|
42
|
-
action :modify
|
43
|
-
delim ::File::PATH_SEPARATOR
|
44
|
-
value path.tr("/", '\\')
|
45
|
-
end
|
46
|
-
end
|
47
|
-
|
48
|
-
action :remove do
|
49
|
-
# The windows Env provider does not correctly expand variables in
|
50
|
-
# the PATH environment variable. Ruby expects these to be expanded.
|
51
|
-
#
|
52
|
-
path = expand_path(new_resource.path)
|
53
|
-
declare_resource(:env, "path") do
|
54
|
-
action :delete
|
55
|
-
delim ::File::PATH_SEPARATOR
|
56
|
-
value path.tr("/", '\\')
|
57
|
-
end
|
58
|
-
end
|
59
|
-
end
|
60
|
-
end
|
61
|
-
end
|
@@ -1,632 +0,0 @@
|
|
1
|
-
#
|
2
|
-
# Author:: Nimisha Sharad (<nimisha.sharad@msystechnologies.com>)
|
3
|
-
# Copyright:: Copyright (c) Chef Software Inc.
|
4
|
-
# License:: Apache License, Version 2.0
|
5
|
-
#
|
6
|
-
# Licensed under the Apache License, Version 2.0 (the "License");
|
7
|
-
# you may not use this file except in compliance with the License.
|
8
|
-
# You may obtain a copy of the License at
|
9
|
-
#
|
10
|
-
# http://www.apache.org/licenses/LICENSE-2.0
|
11
|
-
#
|
12
|
-
# Unless required by applicable law or agreed to in writing, software
|
13
|
-
# distributed under the License is distributed on an "AS IS" BASIS,
|
14
|
-
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
15
|
-
# See the License for the specific language governing permissions and
|
16
|
-
# limitations under the License.
|
17
|
-
#
|
18
|
-
|
19
|
-
require "rexml/document" unless defined?(REXML::Document)
|
20
|
-
require "iso8601" if ChefUtils.windows?
|
21
|
-
require_relative "../provider"
|
22
|
-
require_relative "../util/path_helper"
|
23
|
-
require "win32/taskscheduler" if ChefUtils.windows?
|
24
|
-
|
25
|
-
class Chef
|
26
|
-
class Provider
|
27
|
-
class WindowsTask < Chef::Provider
|
28
|
-
if ChefUtils.windows?
|
29
|
-
include Win32
|
30
|
-
|
31
|
-
provides :windows_task
|
32
|
-
|
33
|
-
MONTHS = {
|
34
|
-
JAN: TaskScheduler::JANUARY,
|
35
|
-
FEB: TaskScheduler::FEBRUARY,
|
36
|
-
MAR: TaskScheduler::MARCH,
|
37
|
-
APR: TaskScheduler::APRIL,
|
38
|
-
MAY: TaskScheduler::MAY,
|
39
|
-
JUN: TaskScheduler::JUNE,
|
40
|
-
JUL: TaskScheduler::JULY,
|
41
|
-
AUG: TaskScheduler::AUGUST,
|
42
|
-
SEP: TaskScheduler::SEPTEMBER,
|
43
|
-
OCT: TaskScheduler::OCTOBER,
|
44
|
-
NOV: TaskScheduler::NOVEMBER,
|
45
|
-
DEC: TaskScheduler::DECEMBER,
|
46
|
-
}.freeze
|
47
|
-
|
48
|
-
DAYS_OF_WEEK = { MON: TaskScheduler::MONDAY,
|
49
|
-
TUE: TaskScheduler::TUESDAY,
|
50
|
-
WED: TaskScheduler::WEDNESDAY,
|
51
|
-
THU: TaskScheduler::THURSDAY,
|
52
|
-
FRI: TaskScheduler::FRIDAY,
|
53
|
-
SAT: TaskScheduler::SATURDAY,
|
54
|
-
SUN: TaskScheduler::SUNDAY }.freeze
|
55
|
-
|
56
|
-
WEEKS_OF_MONTH = {
|
57
|
-
FIRST: TaskScheduler::FIRST_WEEK,
|
58
|
-
SECOND: TaskScheduler::SECOND_WEEK,
|
59
|
-
THIRD: TaskScheduler::THIRD_WEEK,
|
60
|
-
FOURTH: TaskScheduler::FOURTH_WEEK,
|
61
|
-
}.freeze
|
62
|
-
|
63
|
-
DAYS_OF_MONTH = {
|
64
|
-
1 => TaskScheduler::TASK_FIRST,
|
65
|
-
2 => TaskScheduler::TASK_SECOND,
|
66
|
-
3 => TaskScheduler::TASK_THIRD,
|
67
|
-
4 => TaskScheduler::TASK_FOURTH,
|
68
|
-
5 => TaskScheduler::TASK_FIFTH,
|
69
|
-
6 => TaskScheduler::TASK_SIXTH,
|
70
|
-
7 => TaskScheduler::TASK_SEVENTH,
|
71
|
-
8 => TaskScheduler::TASK_EIGHTH,
|
72
|
-
# cspell:disable-next-line
|
73
|
-
9 => TaskScheduler::TASK_NINETH,
|
74
|
-
10 => TaskScheduler::TASK_TENTH,
|
75
|
-
11 => TaskScheduler::TASK_ELEVENTH,
|
76
|
-
12 => TaskScheduler::TASK_TWELFTH,
|
77
|
-
13 => TaskScheduler::TASK_THIRTEENTH,
|
78
|
-
14 => TaskScheduler::TASK_FOURTEENTH,
|
79
|
-
15 => TaskScheduler::TASK_FIFTEENTH,
|
80
|
-
16 => TaskScheduler::TASK_SIXTEENTH,
|
81
|
-
17 => TaskScheduler::TASK_SEVENTEENTH,
|
82
|
-
18 => TaskScheduler::TASK_EIGHTEENTH,
|
83
|
-
19 => TaskScheduler::TASK_NINETEENTH,
|
84
|
-
20 => TaskScheduler::TASK_TWENTIETH,
|
85
|
-
21 => TaskScheduler::TASK_TWENTY_FIRST,
|
86
|
-
22 => TaskScheduler::TASK_TWENTY_SECOND,
|
87
|
-
23 => TaskScheduler::TASK_TWENTY_THIRD,
|
88
|
-
24 => TaskScheduler::TASK_TWENTY_FOURTH,
|
89
|
-
25 => TaskScheduler::TASK_TWENTY_FIFTH,
|
90
|
-
26 => TaskScheduler::TASK_TWENTY_SIXTH,
|
91
|
-
27 => TaskScheduler::TASK_TWENTY_SEVENTH,
|
92
|
-
28 => TaskScheduler::TASK_TWENTY_EIGHTH,
|
93
|
-
29 => TaskScheduler::TASK_TWENTY_NINTH,
|
94
|
-
# cspell:disable-next-line
|
95
|
-
30 => TaskScheduler::TASK_THIRTYETH,
|
96
|
-
31 => TaskScheduler::TASK_THIRTY_FIRST,
|
97
|
-
}.freeze
|
98
|
-
|
99
|
-
PRIORITY = { "critical" => 0, "highest" => 1, "above_normal_2" => 2 , "above_normal_3" => 3, "normal_4" => 4,
|
100
|
-
"normal_5" => 5, "normal_6" => 6, "below_normal_7" => 7, "below_normal_8" => 8, "lowest" => 9, "idle" => 10 }.freeze
|
101
|
-
|
102
|
-
def load_current_resource
|
103
|
-
@current_resource = Chef::Resource::WindowsTask.new(new_resource.name)
|
104
|
-
task = TaskScheduler.new(new_resource.task_name, nil, "\\", false)
|
105
|
-
@current_resource.exists = task.exists?(new_resource.task_name)
|
106
|
-
if @current_resource.exists
|
107
|
-
task.get_task(new_resource.task_name)
|
108
|
-
@current_resource.task = task
|
109
|
-
pathed_task_name = new_resource.task_name.start_with?('\\') ? new_resource.task_name : "\\#{new_resource.task_name}"
|
110
|
-
@current_resource.task_name(pathed_task_name)
|
111
|
-
end
|
112
|
-
@current_resource
|
113
|
-
end
|
114
|
-
|
115
|
-
action :create do
|
116
|
-
set_command_and_arguments if new_resource.command
|
117
|
-
|
118
|
-
if current_resource.exists
|
119
|
-
logger.trace "#{new_resource} task exist."
|
120
|
-
unless (task_needs_update?(current_resource.task)) || (new_resource.force)
|
121
|
-
logger.info "#{new_resource} task does not need updating and force is not specified - nothing to do"
|
122
|
-
return
|
123
|
-
end
|
124
|
-
|
125
|
-
# if start_day and start_time is not set by user current date and time will be set while updating any property
|
126
|
-
set_start_day_and_time unless new_resource.frequency == :none
|
127
|
-
update_task(current_resource.task)
|
128
|
-
else
|
129
|
-
basic_validation
|
130
|
-
set_start_day_and_time
|
131
|
-
converge_by("#{new_resource} task created") do
|
132
|
-
task = TaskScheduler.new
|
133
|
-
if new_resource.frequency == :none
|
134
|
-
task.new_work_item(new_resource.task_name, {}, { user: new_resource.user, password: new_resource.password, interactive: new_resource.interactive_enabled })
|
135
|
-
task.activate(new_resource.task_name)
|
136
|
-
else
|
137
|
-
task.new_work_item(new_resource.task_name, trigger, { user: new_resource.user, password: new_resource.password, interactive: new_resource.interactive_enabled })
|
138
|
-
end
|
139
|
-
task.application_name = new_resource.command
|
140
|
-
task.parameters = new_resource.command_arguments if new_resource.command_arguments
|
141
|
-
task.working_directory = new_resource.cwd if new_resource.cwd
|
142
|
-
task.configure_settings(config_settings)
|
143
|
-
task.configure_principals(principal_settings)
|
144
|
-
task.set_account_information(new_resource.user, new_resource.password, new_resource.interactive_enabled)
|
145
|
-
task.creator = new_resource.user
|
146
|
-
task.description = new_resource.description unless new_resource.description.nil?
|
147
|
-
task.activate(new_resource.task_name)
|
148
|
-
end
|
149
|
-
end
|
150
|
-
end
|
151
|
-
|
152
|
-
action :run do
|
153
|
-
if current_resource.exists
|
154
|
-
logger.trace "#{new_resource} task exists"
|
155
|
-
if current_resource.task.status == "running"
|
156
|
-
logger.info "#{new_resource} task is currently running, skipping run"
|
157
|
-
else
|
158
|
-
converge_by("run scheduled task #{new_resource}") do
|
159
|
-
current_resource.task.run
|
160
|
-
end
|
161
|
-
end
|
162
|
-
else
|
163
|
-
logger.warn "#{new_resource} task does not exist - nothing to do"
|
164
|
-
end
|
165
|
-
end
|
166
|
-
|
167
|
-
action :delete do
|
168
|
-
if current_resource.exists
|
169
|
-
logger.trace "#{new_resource} task exists"
|
170
|
-
converge_by("delete scheduled task #{new_resource}") do
|
171
|
-
ts = TaskScheduler.new
|
172
|
-
ts.delete(current_resource.task_name)
|
173
|
-
end
|
174
|
-
else
|
175
|
-
logger.warn "#{new_resource} task does not exist - nothing to do"
|
176
|
-
end
|
177
|
-
end
|
178
|
-
|
179
|
-
action :end do
|
180
|
-
if current_resource.exists
|
181
|
-
logger.trace "#{new_resource} task exists"
|
182
|
-
if current_resource.task.status != "running"
|
183
|
-
logger.trace "#{new_resource} is not running - nothing to do"
|
184
|
-
else
|
185
|
-
converge_by("#{new_resource} task ended") do
|
186
|
-
current_resource.task.stop
|
187
|
-
end
|
188
|
-
end
|
189
|
-
else
|
190
|
-
logger.warn "#{new_resource} task does not exist - nothing to do"
|
191
|
-
end
|
192
|
-
end
|
193
|
-
|
194
|
-
action :enable do
|
195
|
-
if current_resource.exists
|
196
|
-
logger.trace "#{new_resource} task exists"
|
197
|
-
if current_resource.task.status == "not scheduled"
|
198
|
-
converge_by("#{new_resource} task enabled") do
|
199
|
-
# TODO wind32-taskscheduler currently not having any method to handle this so using schtasks.exe here
|
200
|
-
run_schtasks "CHANGE", "ENABLE" => ""
|
201
|
-
end
|
202
|
-
else
|
203
|
-
logger.trace "#{new_resource} already enabled - nothing to do"
|
204
|
-
end
|
205
|
-
else
|
206
|
-
logger.fatal "#{new_resource} task does not exist - nothing to do"
|
207
|
-
raise Errno::ENOENT, "#{new_resource}: task does not exist, cannot enable"
|
208
|
-
end
|
209
|
-
end
|
210
|
-
|
211
|
-
action :disable do
|
212
|
-
if current_resource.exists
|
213
|
-
logger.info "#{new_resource} task exists"
|
214
|
-
if %w{ready running}.include?(current_resource.task.status)
|
215
|
-
converge_by("#{new_resource} task disabled") do
|
216
|
-
# TODO: in win32-taskscheduler there is no method which disables the task so currently calling disable with schtasks.exe
|
217
|
-
run_schtasks "CHANGE", "DISABLE" => ""
|
218
|
-
end
|
219
|
-
else
|
220
|
-
logger.warn "#{new_resource} already disabled - nothing to do"
|
221
|
-
end
|
222
|
-
else
|
223
|
-
logger.warn "#{new_resource} task does not exist - nothing to do"
|
224
|
-
end
|
225
|
-
end
|
226
|
-
|
227
|
-
alias_method :action_change, :action_create
|
228
|
-
|
229
|
-
private
|
230
|
-
|
231
|
-
# separated command arguments from :command property
|
232
|
-
def set_command_and_arguments
|
233
|
-
cmd, *args = Chef::Util::PathHelper.split_args(new_resource.command)
|
234
|
-
new_resource.command = cmd
|
235
|
-
new_resource.command_arguments = args.join(" ")
|
236
|
-
end
|
237
|
-
|
238
|
-
def set_start_day_and_time
|
239
|
-
new_resource.start_day = Time.now.strftime("%m/%d/%Y") unless new_resource.start_day
|
240
|
-
new_resource.start_time = Time.now.strftime("%H:%M") unless new_resource.start_time
|
241
|
-
end
|
242
|
-
|
243
|
-
def update_task(task)
|
244
|
-
converge_by("#{new_resource} task updated") do
|
245
|
-
task.set_account_information(new_resource.user, new_resource.password, new_resource.interactive_enabled)
|
246
|
-
task.application_name = new_resource.command if new_resource.command
|
247
|
-
task.parameters = new_resource.command_arguments if new_resource.command_arguments
|
248
|
-
task.working_directory = new_resource.cwd if new_resource.cwd
|
249
|
-
task.trigger = trigger unless new_resource.frequency == :none
|
250
|
-
task.configure_settings(config_settings)
|
251
|
-
task.creator = new_resource.user
|
252
|
-
task.description = new_resource.description unless new_resource.description.nil?
|
253
|
-
task.configure_principals(principal_settings)
|
254
|
-
end
|
255
|
-
end
|
256
|
-
|
257
|
-
def trigger
|
258
|
-
start_month, start_day, start_year = new_resource.start_day.to_s.split("/")
|
259
|
-
start_hour, start_minute = new_resource.start_time.to_s.split(":")
|
260
|
-
# TODO currently end_month, end_year and end_year needs to be set to 0. If not set win32-taskscheduler throwing nil into integer error.
|
261
|
-
trigger_hash = {
|
262
|
-
start_year: start_year.to_i,
|
263
|
-
start_month: start_month.to_i,
|
264
|
-
start_day: start_day.to_i,
|
265
|
-
start_hour: start_hour.to_i,
|
266
|
-
start_minute: start_minute.to_i,
|
267
|
-
end_month: 0,
|
268
|
-
end_day: 0,
|
269
|
-
end_year: 0,
|
270
|
-
trigger_type: trigger_type,
|
271
|
-
type: type,
|
272
|
-
random_minutes_interval: new_resource.random_delay,
|
273
|
-
}
|
274
|
-
|
275
|
-
if new_resource.frequency == :minute
|
276
|
-
trigger_hash[:minutes_interval] = new_resource.frequency_modifier
|
277
|
-
end
|
278
|
-
|
279
|
-
if new_resource.frequency == :hourly
|
280
|
-
minutes = convert_hours_in_minutes(new_resource.frequency_modifier.to_i)
|
281
|
-
trigger_hash[:minutes_interval] = minutes
|
282
|
-
end
|
283
|
-
|
284
|
-
if new_resource.minutes_interval
|
285
|
-
trigger_hash[:minutes_interval] = new_resource.minutes_interval
|
286
|
-
end
|
287
|
-
|
288
|
-
if new_resource.minutes_duration
|
289
|
-
trigger_hash[:minutes_duration] = new_resource.minutes_duration
|
290
|
-
end
|
291
|
-
|
292
|
-
if trigger_type == TaskScheduler::MONTHLYDOW && frequency_modifier_contains_last_week?(new_resource.frequency_modifier)
|
293
|
-
trigger_hash[:run_on_last_week_of_month] = true
|
294
|
-
else
|
295
|
-
trigger_hash[:run_on_last_week_of_month] = false
|
296
|
-
end
|
297
|
-
|
298
|
-
if trigger_type == TaskScheduler::MONTHLYDATE && day_includes_last_or_lastday?(new_resource.day)
|
299
|
-
trigger_hash[:run_on_last_day_of_month] = true
|
300
|
-
else
|
301
|
-
trigger_hash[:run_on_last_day_of_month] = false
|
302
|
-
end
|
303
|
-
trigger_hash
|
304
|
-
end
|
305
|
-
|
306
|
-
def frequency_modifier_contains_last_week?(frequency_modifier)
|
307
|
-
frequency_modifier = frequency_modifier.to_s.split(",")
|
308
|
-
frequency_modifier.map! { |value| value.strip.upcase }
|
309
|
-
frequency_modifier.include?("LAST")
|
310
|
-
end
|
311
|
-
|
312
|
-
def day_includes_last_or_lastday?(day)
|
313
|
-
day = day.to_s.split(",")
|
314
|
-
day.map! { |value| value.strip.upcase }
|
315
|
-
day.include?("LAST") || day.include?("LASTDAY")
|
316
|
-
end
|
317
|
-
|
318
|
-
def convert_hours_in_minutes(hours)
|
319
|
-
hours.to_i * 60 if hours
|
320
|
-
end
|
321
|
-
|
322
|
-
# TODO : Try to optimize this method
|
323
|
-
# known issue : Since start_day and time is not mandatory while updating weekly frequency for which start_day is not mentioned by user idempotency
|
324
|
-
# is not getting maintained as new_resource.start_day is nil and we fetch the day of week from start_day to set and its currently coming as nil and don't match with current_task
|
325
|
-
def task_needs_update?(task)
|
326
|
-
flag = false
|
327
|
-
if new_resource.frequency == :none
|
328
|
-
flag = (task.author != new_resource.user ||
|
329
|
-
task.application_name != new_resource.command ||
|
330
|
-
description_needs_update?(task) ||
|
331
|
-
task.parameters != new_resource.command_arguments.to_s ||
|
332
|
-
task.principals[:run_level] != run_level ||
|
333
|
-
task.settings[:disallow_start_if_on_batteries] != new_resource.disallow_start_if_on_batteries ||
|
334
|
-
task.settings[:stop_if_going_on_batteries] != new_resource.stop_if_going_on_batteries ||
|
335
|
-
task.settings[:start_when_available] != new_resource.start_when_available)
|
336
|
-
else
|
337
|
-
current_task_trigger = task.trigger(0)
|
338
|
-
new_task_trigger = trigger
|
339
|
-
flag = (ISO8601::Duration.new(task.idle_settings[:idle_duration])) != (ISO8601::Duration.new(new_resource.idle_time * 60)) if new_resource.frequency == :on_idle
|
340
|
-
flag = (ISO8601::Duration.new(task.execution_time_limit)) != (ISO8601::Duration.new(new_resource.execution_time_limit * 60)) unless new_resource.execution_time_limit.nil?
|
341
|
-
|
342
|
-
# if trigger not found updating the task to add the trigger
|
343
|
-
if current_task_trigger.nil?
|
344
|
-
flag = true
|
345
|
-
else
|
346
|
-
flag = true if start_day_updated?(current_task_trigger, new_task_trigger) == true ||
|
347
|
-
start_time_updated?(current_task_trigger, new_task_trigger) == true ||
|
348
|
-
current_task_trigger[:trigger_type] != new_task_trigger[:trigger_type] ||
|
349
|
-
current_task_trigger[:type] != new_task_trigger[:type] ||
|
350
|
-
current_task_trigger[:random_minutes_interval].to_i != new_task_trigger[:random_minutes_interval].to_i ||
|
351
|
-
current_task_trigger[:minutes_interval].to_i != new_task_trigger[:minutes_interval].to_i ||
|
352
|
-
task.author.to_s.casecmp(new_resource.user.to_s) != 0 ||
|
353
|
-
task.application_name != new_resource.command ||
|
354
|
-
description_needs_update?(task) ||
|
355
|
-
task.parameters != new_resource.command_arguments.to_s ||
|
356
|
-
task.working_directory != new_resource.cwd.to_s ||
|
357
|
-
task.principals[:logon_type] != logon_type ||
|
358
|
-
task.principals[:run_level] != run_level ||
|
359
|
-
PRIORITY[task.priority] != new_resource.priority ||
|
360
|
-
task.settings[:disallow_start_if_on_batteries] != new_resource.disallow_start_if_on_batteries ||
|
361
|
-
task.settings[:stop_if_going_on_batteries] != new_resource.stop_if_going_on_batteries ||
|
362
|
-
task.settings[:start_when_available] != new_resource.start_when_available
|
363
|
-
if trigger_type == TaskScheduler::MONTHLYDATE
|
364
|
-
flag = true if current_task_trigger[:run_on_last_day_of_month] != new_task_trigger[:run_on_last_day_of_month]
|
365
|
-
end
|
366
|
-
|
367
|
-
if trigger_type == TaskScheduler::MONTHLYDOW
|
368
|
-
flag = true if current_task_trigger[:run_on_last_week_of_month] != new_task_trigger[:run_on_last_week_of_month]
|
369
|
-
end
|
370
|
-
end
|
371
|
-
end
|
372
|
-
flag
|
373
|
-
end
|
374
|
-
|
375
|
-
def start_day_updated?(current_task_trigger, new_task_trigger)
|
376
|
-
( new_resource.start_day && (current_task_trigger[:start_year].to_i != new_task_trigger[:start_year] ||
|
377
|
-
current_task_trigger[:start_month].to_i != new_task_trigger[:start_month] ||
|
378
|
-
current_task_trigger[:start_day].to_i != new_task_trigger[:start_day]) )
|
379
|
-
end
|
380
|
-
|
381
|
-
def start_time_updated?(current_task_trigger, new_task_trigger)
|
382
|
-
( new_resource.start_time && ( current_task_trigger[:start_hour].to_i != new_task_trigger[:start_hour] ||
|
383
|
-
current_task_trigger[:start_minute].to_i != new_task_trigger[:start_minute] ) )
|
384
|
-
end
|
385
|
-
|
386
|
-
def trigger_type
|
387
|
-
case new_resource.frequency
|
388
|
-
when :once, :minute, :hourly
|
389
|
-
TaskScheduler::ONCE
|
390
|
-
when :daily
|
391
|
-
TaskScheduler::DAILY
|
392
|
-
when :weekly
|
393
|
-
TaskScheduler::WEEKLY
|
394
|
-
when :monthly
|
395
|
-
# If frequency modifier is set with frequency :monthly we are setting taskscheduler as monthlydow
|
396
|
-
# Ref https://msdn.microsoft.com/en-us/library/windows/desktop/aa382061(v=vs.85).aspx
|
397
|
-
new_resource.frequency_modifier.to_i.between?(1, 12) ? TaskScheduler::MONTHLYDATE : TaskScheduler::MONTHLYDOW
|
398
|
-
when :on_idle
|
399
|
-
TaskScheduler::ON_IDLE
|
400
|
-
when :onstart
|
401
|
-
TaskScheduler::AT_SYSTEMSTART
|
402
|
-
when :on_logon
|
403
|
-
TaskScheduler::AT_LOGON
|
404
|
-
else
|
405
|
-
raise ArgumentError, "Please set frequency"
|
406
|
-
end
|
407
|
-
end
|
408
|
-
|
409
|
-
def type
|
410
|
-
case trigger_type
|
411
|
-
when TaskScheduler::ONCE
|
412
|
-
{ once: nil }
|
413
|
-
when TaskScheduler::DAILY
|
414
|
-
{ days_interval: new_resource.frequency_modifier.to_i }
|
415
|
-
when TaskScheduler::WEEKLY
|
416
|
-
{ weeks_interval: new_resource.frequency_modifier.to_i, days_of_week: days_of_week.to_i }
|
417
|
-
when TaskScheduler::MONTHLYDATE
|
418
|
-
{ months: months_of_year.to_i, days: days_of_month.to_i }
|
419
|
-
when TaskScheduler::MONTHLYDOW
|
420
|
-
{ months: months_of_year.to_i, days_of_week: days_of_week.to_i, weeks_of_month: weeks_of_month.to_i }
|
421
|
-
when TaskScheduler::ON_IDLE
|
422
|
-
# TODO: handle option for this trigger
|
423
|
-
when TaskScheduler::AT_LOGON
|
424
|
-
# TODO: handle option for this trigger
|
425
|
-
when TaskScheduler::AT_SYSTEMSTART
|
426
|
-
# TODO: handle option for this trigger
|
427
|
-
end
|
428
|
-
end
|
429
|
-
|
430
|
-
# Deleting last from the array of weeks of month since last week is handled in :run_on_last_week_of_month parameter.
|
431
|
-
def weeks_of_month
|
432
|
-
weeks_of_month = []
|
433
|
-
if new_resource.frequency_modifier
|
434
|
-
weeks = new_resource.frequency_modifier.split(",")
|
435
|
-
weeks.map! { |week| week.to_s.strip.upcase }
|
436
|
-
weeks.delete("LAST") if weeks.include?("LAST")
|
437
|
-
weeks_of_month = get_binary_values_from_constants(weeks, WEEKS_OF_MONTH)
|
438
|
-
end
|
439
|
-
weeks_of_month
|
440
|
-
end
|
441
|
-
|
442
|
-
# Deleting the "LAST" and "LASTDAY" from days since last day is handled in :run_on_last_day_of_month parameter.
|
443
|
-
def days_of_month
|
444
|
-
days_of_month = []
|
445
|
-
if new_resource.day
|
446
|
-
days = new_resource.day.to_s.split(",")
|
447
|
-
days.map! { |day| day.to_s.strip.upcase }
|
448
|
-
days.delete("LAST") if days.include?("LAST")
|
449
|
-
days.delete("LASTDAY") if days.include?("LASTDAY")
|
450
|
-
if days - (1..31).to_a
|
451
|
-
days.each do |day|
|
452
|
-
days_of_month << DAYS_OF_MONTH[day.to_i]
|
453
|
-
end
|
454
|
-
days_of_month = days_of_month.size > 1 ? days_of_month.inject(:|) : days_of_month[0]
|
455
|
-
end
|
456
|
-
else
|
457
|
-
days_of_month = DAYS_OF_MONTH[1]
|
458
|
-
end
|
459
|
-
days_of_month
|
460
|
-
end
|
461
|
-
|
462
|
-
def days_of_week
|
463
|
-
if new_resource.day
|
464
|
-
# this line of code is just to support backward compatibility of wild card *
|
465
|
-
new_resource.day = "mon, tue, wed, thu, fri, sat, sun" if new_resource.day == "*" && new_resource.frequency == :weekly
|
466
|
-
days = new_resource.day.to_s.split(",")
|
467
|
-
days.map! { |day| day.to_s.strip.upcase }
|
468
|
-
weeks_days = get_binary_values_from_constants(days, DAYS_OF_WEEK)
|
469
|
-
else
|
470
|
-
# following condition will make the frequency :weekly idempotent if start_day is not provided by user setting day as the current_resource day
|
471
|
-
if (current_resource) && (current_resource.task) && (current_resource.task.trigger(0)[:type][:days_of_week]) && (new_resource.start_day.nil?)
|
472
|
-
weeks_days = current_resource.task.trigger(0)[:type][:days_of_week]
|
473
|
-
else
|
474
|
-
day = get_day(new_resource.start_day).to_sym if new_resource.start_day
|
475
|
-
DAYS_OF_WEEK[day]
|
476
|
-
end
|
477
|
-
end
|
478
|
-
end
|
479
|
-
|
480
|
-
def months_of_year
|
481
|
-
months_of_year = []
|
482
|
-
if new_resource.frequency_modifier.to_i.between?(1, 12) && !(new_resource.months)
|
483
|
-
new_resource.months = set_months(new_resource.frequency_modifier.to_i)
|
484
|
-
end
|
485
|
-
|
486
|
-
if new_resource.months
|
487
|
-
# this line of code is just to support backward compatibility of wild card *
|
488
|
-
new_resource.months = "jan, feb, mar, apr, may, jun, jul, aug, sep, oct, nov, dec" if new_resource.months == "*" && new_resource.frequency == :monthly
|
489
|
-
months = new_resource.months.split(",")
|
490
|
-
months.map! { |month| month.to_s.strip.upcase }
|
491
|
-
months_of_year = get_binary_values_from_constants(months, MONTHS)
|
492
|
-
else
|
493
|
-
MONTHS.each do |key, value|
|
494
|
-
months_of_year << MONTHS[key]
|
495
|
-
end
|
496
|
-
months_of_year = months_of_year.inject(:|)
|
497
|
-
end
|
498
|
-
months_of_year
|
499
|
-
end
|
500
|
-
|
501
|
-
# This values are set for frequency_modifier set as 1-12
|
502
|
-
# This is to give backward compatibility validated this values with earlier code and running schtask.exe
|
503
|
-
# Used this as reference https://docs.microsoft.com/en-us/windows-server/administration/windows-commands/schtasks#d-dayday--
|
504
|
-
def set_months(frequency_modifier)
|
505
|
-
case frequency_modifier
|
506
|
-
when 1
|
507
|
-
"jan, feb, mar, apr, may, jun, jul, aug, sep, oct, nov, dec"
|
508
|
-
when 2
|
509
|
-
"feb, apr, jun, aug, oct, dec"
|
510
|
-
when 3
|
511
|
-
"mar, jun, sep, dec"
|
512
|
-
when 4
|
513
|
-
"apr, aug, dec"
|
514
|
-
when 5
|
515
|
-
"may, oct"
|
516
|
-
when 6
|
517
|
-
"jun, dec"
|
518
|
-
when 7
|
519
|
-
"jul"
|
520
|
-
when 8
|
521
|
-
"aug"
|
522
|
-
when 9
|
523
|
-
"sep"
|
524
|
-
when 10
|
525
|
-
"oct"
|
526
|
-
when 11
|
527
|
-
"nov"
|
528
|
-
when 12
|
529
|
-
"dec"
|
530
|
-
end
|
531
|
-
end
|
532
|
-
|
533
|
-
def get_binary_values_from_constants(array_values, constant)
|
534
|
-
data = []
|
535
|
-
array_values.each do |value|
|
536
|
-
value = value.to_sym
|
537
|
-
data << constant[value]
|
538
|
-
end
|
539
|
-
data.size > 1 ? data.inject(:|) : data[0]
|
540
|
-
end
|
541
|
-
|
542
|
-
def run_level
|
543
|
-
case new_resource.run_level
|
544
|
-
when :highest
|
545
|
-
TaskScheduler::TASK_RUNLEVEL_HIGHEST
|
546
|
-
when :limited
|
547
|
-
TaskScheduler::TASK_RUNLEVEL_LUA
|
548
|
-
end
|
549
|
-
end
|
550
|
-
|
551
|
-
# TODO: while creating the configuration settings win32-taskscheduler it accepts execution time limit values in ISO8601 format
|
552
|
-
def config_settings
|
553
|
-
settings = {
|
554
|
-
execution_time_limit: new_resource.execution_time_limit,
|
555
|
-
enabled: true,
|
556
|
-
}
|
557
|
-
settings[:idle_duration] = new_resource.idle_time if new_resource.idle_time
|
558
|
-
settings[:run_only_if_idle] = true if new_resource.idle_time
|
559
|
-
settings[:priority] = new_resource.priority
|
560
|
-
settings[:disallow_start_if_on_batteries] = new_resource.disallow_start_if_on_batteries
|
561
|
-
settings[:stop_if_going_on_batteries] = new_resource.stop_if_going_on_batteries
|
562
|
-
settings[:start_when_available] = new_resource.start_when_available
|
563
|
-
settings
|
564
|
-
end
|
565
|
-
|
566
|
-
def principal_settings
|
567
|
-
settings = {}
|
568
|
-
settings[:run_level] = run_level
|
569
|
-
settings[:logon_type] = logon_type
|
570
|
-
settings
|
571
|
-
end
|
572
|
-
|
573
|
-
def description_needs_update?(task)
|
574
|
-
task.description != new_resource.description unless new_resource.description.nil?
|
575
|
-
end
|
576
|
-
|
577
|
-
def logon_type
|
578
|
-
# Ref: https://msdn.microsoft.com/en-us/library/windows/desktop/aa383566(v=vs.85).aspx
|
579
|
-
# if nothing is passed as logon_type the TASK_LOGON_SERVICE_ACCOUNT is getting set as default so using that for comparison.
|
580
|
-
user_id = new_resource.user.to_s
|
581
|
-
password = new_resource.password.to_s
|
582
|
-
if Chef::ReservedNames::Win32::Security::SID.service_account_user?(user_id)
|
583
|
-
TaskScheduler::TASK_LOGON_SERVICE_ACCOUNT
|
584
|
-
elsif Chef::ReservedNames::Win32::Security::SID.group_user?(user_id)
|
585
|
-
TaskScheduler::TASK_LOGON_GROUP
|
586
|
-
elsif !user_id.empty? && !password.empty?
|
587
|
-
if new_resource.interactive_enabled
|
588
|
-
TaskScheduler::TASK_LOGON_INTERACTIVE_TOKEN
|
589
|
-
else
|
590
|
-
TaskScheduler::TASK_LOGON_PASSWORD
|
591
|
-
end
|
592
|
-
else
|
593
|
-
TaskScheduler::TASK_LOGON_INTERACTIVE_TOKEN
|
594
|
-
end
|
595
|
-
end
|
596
|
-
|
597
|
-
# This method checks if task and command properties exist since those two are mandatory properties to create a schedules task.
|
598
|
-
def basic_validation
|
599
|
-
validate = []
|
600
|
-
validate << "Command" if new_resource.command.nil? || new_resource.command.empty?
|
601
|
-
validate << "Task Name" if new_resource.task_name.nil? || new_resource.task_name.empty?
|
602
|
-
return true if validate.empty?
|
603
|
-
|
604
|
-
raise Chef::Exceptions::ValidationFailed.new "Value for '#{validate.join(", ")}' option cannot be empty"
|
605
|
-
end
|
606
|
-
|
607
|
-
# rubocop:disable Style/StringLiteralsInInterpolation
|
608
|
-
def run_schtasks(task_action, options = {})
|
609
|
-
cmd = "schtasks /#{task_action} /TN \"#{new_resource.task_name}\" "
|
610
|
-
options.each_key do |option|
|
611
|
-
unless option == "TR"
|
612
|
-
cmd += "/#{option} "
|
613
|
-
cmd += "\"#{options[option].to_s.gsub('"', "\\\"")}\" " unless options[option] == ""
|
614
|
-
end
|
615
|
-
end
|
616
|
-
# Appending Task Run [TR] option at the end since appending causing sometimes to append other options in option["TR"] value
|
617
|
-
if options["TR"]
|
618
|
-
cmd += "/TR \"#{options["TR"]} \" " unless task_action == "DELETE"
|
619
|
-
end
|
620
|
-
logger.trace("running: ")
|
621
|
-
logger.trace(" #{cmd}")
|
622
|
-
shell_out!(cmd, returns: [0])
|
623
|
-
end
|
624
|
-
# rubocop:enable Style/StringLiteralsInInterpolation
|
625
|
-
|
626
|
-
def get_day(date)
|
627
|
-
Date.strptime(date, "%m/%d/%Y").strftime("%a").upcase
|
628
|
-
end
|
629
|
-
end
|
630
|
-
end
|
631
|
-
end
|
632
|
-
end
|