chef 16.0.275-universal-mingw32 → 16.2.50-universal-mingw32
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/Gemfile +3 -1
- data/README.md +3 -3
- data/Rakefile +15 -1
- data/chef.gemspec +3 -3
- data/distro/powershell/chef/chef.psm1 +3 -3
- data/distro/templates/powershell/chef/chef.psm1.erb +3 -3
- data/lib/chef/application/apply.rb +2 -2
- data/lib/chef/application/base.rb +1 -1
- data/lib/chef/application/client.rb +1 -1
- data/lib/chef/application/exit_code.rb +2 -2
- data/lib/chef/application/windows_service_manager.rb +1 -1
- data/lib/chef/chef_fs/chef_fs_data_store.rb +3 -3
- data/lib/chef/chef_fs/data_handler/data_bag_item_data_handler.rb +1 -1
- data/lib/chef/chef_fs/file_system/chef_server/acls_dir.rb +1 -1
- data/lib/chef/chef_fs/file_system/chef_server/cookbook_file.rb +1 -1
- data/lib/chef/chef_fs/file_system/chef_server/policies_dir.rb +1 -1
- data/lib/chef/chef_fs/file_system/chef_server/rest_list_dir.rb +1 -1
- data/lib/chef/chef_fs/file_system/multiplexed_dir.rb +1 -1
- data/lib/chef/chef_fs/file_system/repository/directory.rb +1 -1
- data/lib/chef/chef_fs/parallelizer/parallel_enumerable.rb +1 -1
- data/lib/chef/chef_fs/path_utils.rb +4 -4
- data/lib/chef/cookbook/chefignore.rb +1 -1
- data/lib/chef/cookbook/file_system_file_vendor.rb +1 -1
- data/lib/chef/cookbook/metadata.rb +2 -2
- data/lib/chef/cookbook_loader.rb +1 -1
- data/lib/chef/cookbook_manifest.rb +1 -1
- data/lib/chef/cookbook_site_streaming_uploader.rb +1 -1
- data/lib/chef/cookbook_version.rb +7 -7
- data/lib/chef/data_bag.rb +4 -4
- data/lib/chef/data_collector.rb +1 -1
- data/lib/chef/data_collector/error_handlers.rb +1 -1
- data/lib/chef/decorator/lazy_array.rb +2 -2
- data/lib/chef/deprecated.rb +5 -1
- data/lib/chef/digester.rb +4 -4
- data/lib/chef/dsl/declare_resource.rb +1 -1
- data/lib/chef/dsl/platform_introspection.rb +1 -1
- data/lib/chef/encrypted_data_bag_item/decryptor.rb +1 -1
- data/lib/chef/encrypted_data_bag_item/encryptor.rb +1 -1
- data/lib/chef/file_access_control.rb +1 -1
- data/lib/chef/formatters/base.rb +1 -1
- data/lib/chef/formatters/error_inspectors/compile_error_inspector.rb +1 -1
- data/lib/chef/formatters/error_inspectors/node_load_error_inspector.rb +2 -2
- data/lib/chef/formatters/error_inspectors/registration_error_inspector.rb +7 -7
- data/lib/chef/formatters/error_inspectors/resource_failure_inspector.rb +3 -3
- data/lib/chef/http.rb +18 -3
- data/lib/chef/http/decompressor.rb +1 -1
- data/lib/chef/http/http_request.rb +1 -1
- data/lib/chef/http/json_output.rb +1 -1
- data/lib/chef/http/ssl_policies.rb +18 -0
- data/lib/chef/json_compat.rb +1 -1
- data/lib/chef/key.rb +1 -1
- data/lib/chef/knife.rb +2 -2
- data/lib/chef/knife/bootstrap.rb +13 -16
- data/lib/chef/knife/bootstrap/chef_vault_handler.rb +1 -1
- data/lib/chef/knife/bootstrap/client_builder.rb +1 -1
- data/lib/chef/knife/bootstrap/templates/chef-full.erb +9 -9
- data/lib/chef/knife/bootstrap/templates/windows-chef-client-msi.erb +3 -1
- data/lib/chef/knife/client_bulk_delete.rb +1 -1
- data/lib/chef/knife/config_get.rb +1 -1
- data/lib/chef/knife/config_use_profile.rb +15 -5
- data/lib/chef/knife/cookbook_delete.rb +1 -1
- data/lib/chef/knife/core/cookbook_scm_repo.rb +1 -1
- data/lib/chef/knife/core/hashed_command_loader.rb +1 -1
- data/lib/chef/knife/core/node_presenter.rb +1 -1
- data/lib/chef/knife/core/status_presenter.rb +1 -1
- data/lib/chef/knife/core/subcommand_loader.rb +1 -1
- data/lib/chef/knife/core/windows_bootstrap_context.rb +18 -3
- data/lib/chef/knife/data_bag_create.rb +1 -1
- data/lib/chef/knife/key_create_base.rb +1 -1
- data/lib/chef/knife/key_edit_base.rb +1 -1
- data/lib/chef/knife/node_bulk_delete.rb +1 -1
- data/lib/chef/knife/node_run_list_remove.rb +1 -1
- data/lib/chef/knife/role_bulk_delete.rb +1 -1
- data/lib/chef/knife/ssh.rb +2 -2
- data/lib/chef/knife/supermarket_share.rb +1 -1
- data/lib/chef/knife/supermarket_unshare.rb +1 -1
- data/lib/chef/knife/{user_invite_recind.rb → user_invite_rescind.rb} +6 -6
- data/lib/chef/log.rb +1 -1
- data/lib/chef/mixin/api_version_request_handling.rb +1 -1
- data/lib/chef/mixin/checksum.rb +0 -1
- data/lib/chef/mixin/create_path.rb +8 -8
- data/lib/chef/mixin/openssl_helper.rb +4 -4
- data/lib/chef/mixin/properties.rb +4 -2
- data/lib/chef/mixin/securable.rb +2 -2
- data/lib/chef/mixin/shell_out.rb +1 -1
- data/lib/chef/node/attribute.rb +2 -2
- data/lib/chef/node/immutable_collections.rb +1 -1
- data/lib/chef/node/mixin/deep_merge_cache.rb +7 -7
- data/lib/chef/policy_builder/policyfile.rb +1 -1
- data/lib/chef/powershell.rb +1 -1
- data/lib/chef/property.rb +2 -2
- data/lib/chef/provider.rb +3 -3
- data/lib/chef/provider/batch.rb +3 -10
- data/lib/chef/provider/cron.rb +2 -14
- data/lib/chef/provider/directory.rb +1 -1
- data/lib/chef/provider/execute.rb +2 -1
- data/lib/chef/provider/file.rb +1 -1
- data/lib/chef/provider/group/dscl.rb +2 -2
- data/lib/chef/provider/group/windows.rb +1 -1
- data/lib/chef/provider/ifconfig.rb +7 -7
- data/lib/chef/provider/launchd.rb +28 -32
- data/lib/chef/provider/mount/aix.rb +1 -1
- data/lib/chef/provider/mount/windows.rb +2 -2
- data/lib/chef/provider/noop.rb +1 -1
- data/lib/chef/provider/package/cab.rb +1 -1
- data/lib/chef/provider/package/chocolatey.rb +1 -1
- data/lib/chef/provider/package/dpkg.rb +1 -1
- data/lib/chef/provider/package/openbsd.rb +1 -1
- data/lib/chef/provider/package/portage.rb +3 -2
- data/lib/chef/provider/package/powershell.rb +6 -2
- data/lib/chef/provider/package/rubygems.rb +3 -3
- data/lib/chef/provider/package/snap.rb +96 -27
- data/lib/chef/provider/package/windows.rb +2 -2
- data/lib/chef/provider/package/windows/msi.rb +3 -3
- data/lib/chef/provider/package/windows/registry_uninstall_entry.rb +1 -1
- data/lib/chef/provider/package/yum.rb +1 -1
- data/lib/chef/provider/package/yum/yum_cache.rb +1 -1
- data/lib/chef/provider/powershell_script.rb +11 -15
- data/lib/chef/provider/remote_directory.rb +2 -2
- data/lib/chef/provider/remote_file/http.rb +4 -1
- data/lib/chef/provider/script.rb +4 -75
- data/lib/chef/provider/service/arch.rb +2 -2
- data/lib/chef/provider/service/debian.rb +2 -2
- data/lib/chef/provider/service/macosx.rb +13 -2
- data/lib/chef/provider/service/openbsd.rb +4 -4
- data/lib/chef/provider/service/redhat.rb +1 -1
- data/lib/chef/provider/service/simple.rb +3 -3
- data/lib/chef/provider/service/upstart.rb +1 -1
- data/lib/chef/provider/service/windows.rb +1 -1
- data/lib/chef/provider/subversion.rb +2 -2
- data/lib/chef/provider/user/aix.rb +1 -1
- data/lib/chef/provider/user/dscl.rb +6 -6
- data/lib/chef/provider/user/linux.rb +3 -3
- data/lib/chef/provider/user/mac.rb +15 -11
- data/lib/chef/provider/windows_script.rb +87 -25
- data/lib/chef/provider/windows_task.rb +5 -3
- data/lib/chef/provider/zypper_repository.rb +30 -10
- data/lib/chef/resource.rb +25 -14
- data/lib/chef/resource/alternatives.rb +1 -1
- data/lib/chef/resource/apt_package.rb +1 -1
- data/lib/chef/resource/archive_file.rb +28 -8
- data/lib/chef/resource/bash.rb +0 -1
- data/lib/chef/resource/batch.rb +4 -2
- data/lib/chef/resource/chef_client_scheduled_task.rb +13 -1
- data/lib/chef/resource/chef_gem.rb +57 -21
- data/lib/chef/resource/chef_handler.rb +2 -2
- data/lib/chef/resource/chef_vault_secret.rb +1 -1
- data/lib/chef/resource/cron/_cron_shared.rb +98 -0
- data/lib/chef/resource/cron/cron.rb +46 -0
- data/lib/chef/resource/{cron_d.rb → cron/cron_d.rb} +7 -87
- data/lib/chef/resource/cron_access.rb +11 -3
- data/lib/chef/resource/csh.rb +0 -1
- data/lib/chef/resource/dmg_package.rb +1 -1
- data/lib/chef/resource/execute.rb +478 -8
- data/lib/chef/resource/file.rb +10 -8
- data/lib/chef/resource/freebsd_package.rb +1 -1
- data/lib/chef/resource/gem_package.rb +35 -2
- data/lib/chef/resource/helpers/cron_validations.rb +6 -3
- data/lib/chef/resource/homebrew_package.rb +30 -1
- data/lib/chef/resource/homebrew_update.rb +107 -0
- data/lib/chef/resource/hostname.rb +7 -20
- data/lib/chef/resource/kernel_module.rb +14 -1
- data/lib/chef/resource/launchd.rb +4 -4
- data/lib/chef/resource/locale.rb +3 -3
- data/lib/chef/resource/macos_userdefaults.rb +14 -9
- data/lib/chef/resource/mount.rb +1 -1
- data/lib/chef/resource/msu_package.rb +1 -1
- data/lib/chef/resource/perl.rb +0 -1
- data/lib/chef/resource/plist.rb +23 -4
- data/lib/chef/resource/powershell_script.rb +4 -2
- data/lib/chef/resource/python.rb +0 -1
- data/lib/chef/resource/remote_file.rb +26 -10
- data/lib/chef/resource/ruby.rb +0 -1
- data/lib/chef/resource/scm/git.rb +1 -1
- data/lib/chef/resource/ssh_known_hosts_entry.rb +15 -0
- data/lib/chef/resource/sudo.rb +29 -2
- data/lib/chef/resource/swap_file.rb +17 -0
- data/lib/chef/resource/template.rb +1 -1
- data/lib/chef/resource/timezone.rb +15 -0
- data/lib/chef/resource/windows_ad_join.rb +30 -1
- data/lib/chef/resource/windows_audit_policy.rb +227 -0
- data/lib/chef/resource/windows_auto_run.rb +11 -0
- data/lib/chef/resource/windows_certificate.rb +27 -1
- data/lib/chef/resource/windows_dfs_server.rb +1 -1
- data/lib/chef/resource/windows_firewall_rule.rb +2 -2
- data/lib/chef/resource/windows_font.rb +3 -3
- data/lib/chef/resource/windows_package.rb +3 -3
- data/lib/chef/resource/windows_pagefile.rb +2 -2
- data/lib/chef/resource/windows_printer.rb +1 -1
- data/lib/chef/resource/windows_script.rb +2 -16
- data/lib/chef/resource/windows_security_policy.rb +47 -16
- data/lib/chef/resource/windows_share.rb +2 -2
- data/lib/chef/resource/windows_shortcut.rb +1 -2
- data/lib/chef/resource/windows_task.rb +21 -21
- data/lib/chef/resource/windows_user_privilege.rb +45 -3
- data/lib/chef/resource/yum_repository.rb +9 -9
- data/lib/chef/resource_inspector.rb +4 -3
- data/lib/chef/resources.rb +4 -2
- data/lib/chef/run_context/cookbook_compiler.rb +1 -1
- data/lib/chef/search/query.rb +1 -1
- data/lib/chef/shell/ext.rb +1 -1
- data/lib/chef/util/diff.rb +2 -2
- data/lib/chef/util/dsc/lcm_output_parser.rb +3 -3
- data/lib/chef/util/windows/net_user.rb +1 -1
- data/lib/chef/util/windows/volume.rb +1 -1
- data/lib/chef/version.rb +1 -1
- data/lib/chef/win32/api.rb +2 -2
- data/lib/chef/win32/api/error.rb +3 -1
- data/lib/chef/win32/api/file.rb +18 -18
- data/lib/chef/win32/api/net.rb +1 -0
- data/lib/chef/win32/file.rb +1 -1
- data/lib/chef/win32/mutex.rb +1 -1
- data/lib/chef/win32/net.rb +1 -0
- data/lib/chef/win32/process.rb +2 -2
- data/lib/chef/win32/registry.rb +2 -2
- data/lib/chef/win32/security.rb +1 -1
- data/lib/chef/win32/security/sid.rb +4 -4
- data/spec/data/lwrp/providers/buck_passer.rb +1 -1
- data/spec/data/lwrp/providers/buck_passer_2.rb +1 -1
- data/spec/data/lwrp/providers/embedded_resource_accesses_providers_scope.rb +1 -1
- data/spec/functional/resource/cron_spec.rb +10 -0
- data/spec/functional/resource/dnf_package_spec.rb +2 -2
- data/spec/functional/resource/git_spec.rb +6 -6
- data/spec/functional/resource/launchd_spec.rb +232 -0
- data/spec/functional/resource/remote_file_spec.rb +2 -2
- 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_task_spec.rb +12 -12
- data/spec/integration/knife/config_use_profile_spec.rb +55 -2
- data/spec/support/chef_helpers.rb +1 -1
- data/spec/support/platform_helpers.rb +1 -1
- data/spec/support/platforms/win32/spec_service.rb +1 -1
- data/spec/support/shared/functional/execute_resource.rb +1 -1
- data/spec/support/shared/functional/file_resource.rb +1 -1
- data/spec/support/shared/functional/windows_script.rb +1 -1
- data/spec/support/shared/unit/execute_resource.rb +1 -1
- data/spec/support/shared/unit/provider/useradd_based_user_provider.rb +4 -4
- data/spec/unit/application_spec.rb +7 -0
- data/spec/unit/data_bag_spec.rb +1 -1
- data/spec/unit/http/ssl_policies_spec.rb +20 -0
- data/spec/unit/knife/bootstrap_spec.rb +2 -2
- data/spec/unit/knife/core/windows_bootstrap_context_spec.rb +7 -1
- data/spec/unit/knife/role_env_run_list_add_spec.rb +6 -6
- data/spec/unit/knife/role_env_run_list_clear_spec.rb +4 -4
- data/spec/unit/knife/role_env_run_list_remove_spec.rb +4 -4
- data/spec/unit/knife/role_env_run_list_replace_spec.rb +4 -4
- data/spec/unit/knife/role_env_run_list_set_spec.rb +4 -4
- data/spec/unit/knife/role_run_list_add_spec.rb +6 -6
- data/spec/unit/knife/role_run_list_clear_spec.rb +4 -4
- data/spec/unit/knife/role_run_list_remove_spec.rb +4 -4
- data/spec/unit/knife/role_run_list_replace_spec.rb +4 -4
- data/spec/unit/knife/role_run_list_set_spec.rb +4 -4
- data/spec/unit/mixin/openssl_helper_spec.rb +4 -4
- data/spec/unit/mixin/user_context_spec.rb +1 -9
- data/spec/unit/node/attribute_spec.rb +1 -1
- data/spec/unit/property_spec.rb +1 -1
- data/spec/unit/provider/batch_spec.rb +130 -0
- data/spec/unit/provider/cron_spec.rb +9 -49
- data/spec/unit/provider/git_spec.rb +3 -3
- data/spec/unit/provider/group/groupadd_spec.rb +1 -1
- data/spec/unit/provider/launchd_spec.rb +8 -50
- data/spec/unit/provider/osx_profile_spec.rb +2 -2
- data/spec/unit/provider/package/msu_spec.rb +3 -3
- data/spec/unit/provider/package/portage_spec.rb +2 -2
- data/spec/unit/provider/package/powershell_spec.rb +96 -87
- data/spec/unit/provider/package/snap_spec.rb +1 -1
- data/spec/unit/provider/powershell_script_spec.rb +3 -45
- data/spec/unit/provider/script_spec.rb +20 -110
- data/spec/unit/provider/service/gentoo_service_spec.rb +1 -1
- data/spec/unit/provider/zypper_repository_spec.rb +60 -10
- data/spec/unit/provider_resolver_spec.rb +9 -9
- data/spec/unit/resource/archive_file_spec.rb +11 -2
- data/spec/unit/resource/chef_client_scheduled_task_spec.rb +17 -7
- data/spec/unit/resource/cron_spec.rb +2 -2
- data/spec/unit/resource/helpers/cron_validations_spec.rb +5 -1
- data/spec/unit/resource/homebrew_update_spec.rb +30 -0
- data/spec/unit/resource/powershell_script_spec.rb +10 -15
- data/spec/unit/resource/timezone_spec.rb +1 -1
- data/spec/unit/resource/windows_audit_policy_spec.rb +64 -0
- data/spec/unit/resource/windows_dns_record_spec.rb +3 -3
- data/spec/unit/resource/windows_dns_zone_spec.rb +2 -2
- data/spec/unit/resource/windows_package_spec.rb +10 -0
- data/spec/unit/resource/windows_task_spec.rb +1 -1
- data/spec/unit/resource/windows_uac_spec.rb +2 -2
- data/spec/unit/resource/yum_repository_spec.rb +21 -21
- data/spec/unit/resource_spec.rb +67 -1
- data/spec/unit/run_context_spec.rb +1 -1
- data/spec/unit/util/dsc/configuration_generator_spec.rb +1 -1
- data/spec/unit/util/threaded_job_queue_spec.rb +9 -0
- data/spec/unit/win32/registry_spec.rb +1 -1
- metadata +24 -23
- data/lib/chef/resource/cron.rb +0 -157
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 9e2aa147eefe9dffe9b65869ae839952018e04d68e94fa265da3adfdc15593b3
|
4
|
+
data.tar.gz: 44c6f2d935ae22f8577da356c0882c1dcc954d4f6827c88b8932d67bbaf3a3dd
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: b313d3f74e5697c287c26592a8e3e523cf0e04532d203f1c191e116d091e16600611ab65048f3aec404bc28f4b9e2e156c06c918a4d218d14c21fd001546e21c
|
7
|
+
data.tar.gz: 05fcccaa38ec9ad1e82a0bcd1712e3287d3db3c3a045df85df16d82fb69c1c0401d4d6adeee57ccc801c14affdda2cd5df360889a49c22eec55b0cf9711f3eb1
|
data/Gemfile
CHANGED
@@ -22,6 +22,8 @@ end
|
|
22
22
|
|
23
23
|
gem "cheffish", ">= 14"
|
24
24
|
|
25
|
+
gem "chef-telemetry", ">=1.0.8" # 1.0.8 removes the http dep
|
26
|
+
|
25
27
|
group(:omnibus_package) do
|
26
28
|
gem "appbundler"
|
27
29
|
gem "rb-readline"
|
@@ -82,7 +84,7 @@ eval_gemfile("./Gemfile.local") if File.exist?("./Gemfile.local")
|
|
82
84
|
#
|
83
85
|
# We copy (and overwrite) these files every time "bundle <exec|install>" is
|
84
86
|
# executed, just in case they have changed.
|
85
|
-
if RUBY_PLATFORM
|
87
|
+
if RUBY_PLATFORM.match?(/mswin|mingw|windows/)
|
86
88
|
instance_eval do
|
87
89
|
ruby_exe_dir = RbConfig::CONFIG["bindir"]
|
88
90
|
assemblies = Dir.glob(File.expand_path("distro/ruby_bin_folder", Dir.pwd) + "/*.dll")
|
data/README.md
CHANGED
@@ -18,7 +18,7 @@ Chef Infra is a configuration management tool designed to bring automation to yo
|
|
18
18
|
|
19
19
|
### Want to try Chef Infra?
|
20
20
|
|
21
|
-
For Chef Infra usage, please refer to
|
21
|
+
For Chef Infra usage, please refer to [Learn Chef](https://learn.chef.io/), our self-paced, entirely free learning platform. Learn Chef also includes module-based training for Chef Infra, as well as Chef Automate, Chef Habitat, and Chef InSpec.
|
22
22
|
|
23
23
|
Other useful resources for Chef Infra users:
|
24
24
|
|
@@ -26,7 +26,7 @@ Other useful resources for Chef Infra users:
|
|
26
26
|
- Source: <https://github.com/chef/chef/tree/master>
|
27
27
|
- Tickets/Issues: <https://github.com/chef/chef/issues>
|
28
28
|
- Slack: [Chef Community Slack](https://community-slack.chef.io/)
|
29
|
-
- Mailing list: <https://discourse.chef.io>
|
29
|
+
- Mailing list/Forum: <https://discourse.chef.io>
|
30
30
|
|
31
31
|
## Reporting Issues
|
32
32
|
|
@@ -46,7 +46,7 @@ We'd love to have your help developing Chef Infra. See our [Contributing Documen
|
|
46
46
|
|
47
47
|
## License and Copyright
|
48
48
|
|
49
|
-
Copyright 2008-
|
49
|
+
Copyright 2008-2020, Chef Software, Inc.
|
50
50
|
|
51
51
|
```
|
52
52
|
Licensed under the Apache License, Version 2.0 (the "License");
|
data/Rakefile
CHANGED
@@ -58,7 +58,7 @@ namespace :pre_install do
|
|
58
58
|
task all: ["pre_install:install_gems_from_dirs", "pre_install:render_powershell_extension"]
|
59
59
|
end
|
60
60
|
|
61
|
-
# hack in all the preinstall tasks to occur before the
|
61
|
+
# hack in all the preinstall tasks to occur before the traditional install task
|
62
62
|
task install: "pre_install:all"
|
63
63
|
|
64
64
|
# make sure we build the correct gemspec on windows
|
@@ -108,3 +108,17 @@ begin
|
|
108
108
|
rescue LoadError
|
109
109
|
puts "yard is not available. bundle install first to make sure all dependencies are installed."
|
110
110
|
end
|
111
|
+
|
112
|
+
namespace :spellcheck do
|
113
|
+
task :run do
|
114
|
+
sh 'cspell "**/*"'
|
115
|
+
end
|
116
|
+
|
117
|
+
desc "List the unique unrecognized words in the project."
|
118
|
+
task :unknown_words do
|
119
|
+
sh 'cspell "**/*" --wordsOnly --no-summary | sort | uniq'
|
120
|
+
end
|
121
|
+
end
|
122
|
+
|
123
|
+
desc "Run spellcheck on the project."
|
124
|
+
task spellcheck: "spellcheck:run"
|
data/chef.gemspec
CHANGED
@@ -28,11 +28,11 @@ Gem::Specification.new do |s|
|
|
28
28
|
s.add_dependency "mixlib-archive", ">= 0.4", "< 2.0"
|
29
29
|
s.add_dependency "ohai", "~> 16.0"
|
30
30
|
|
31
|
-
s.add_dependency "ffi", "
|
31
|
+
s.add_dependency "ffi", ">= 1.9.25"
|
32
32
|
s.add_dependency "ffi-yajl", "~> 2.2"
|
33
|
-
s.add_dependency "net-ssh", ">= 4.2", "<
|
33
|
+
s.add_dependency "net-ssh", ">= 4.2", "< 7"
|
34
34
|
s.add_dependency "net-ssh-multi", "~> 1.2", ">= 1.2.1"
|
35
|
-
s.add_dependency "net-sftp", "
|
35
|
+
s.add_dependency "net-sftp", ">= 2.1.2", "< 4.0"
|
36
36
|
s.add_dependency "ed25519", "~> 1.2" # ed25519 ssh key support
|
37
37
|
s.add_dependency "bcrypt_pbkdf", "= 1.1.0.rc1" # ed25519 ssh key support
|
38
38
|
s.add_dependency "highline", ">= 1.6.9", "< 3"
|
@@ -358,7 +358,7 @@ function Run-RubyCommand($command, $argList) {
|
|
358
358
|
# When arguments come into this method, the standard PS rules for interpreting cmdlet arguments
|
359
359
|
# apply. When using & (call operator) and providing an array of arguments, powershell (verified
|
360
360
|
# on PS 4.0 on Windows Server 2012R2) will not evaluate them but (contrary to documentation),
|
361
|
-
# it will still marginally interpret them. The
|
361
|
+
# it will still marginally interpret them. The behavior of PS 5.0 seems to be different but
|
362
362
|
# ignore that for now. If any of the provided arguments has a space in it, powershell checks
|
363
363
|
# the first and last character to ensure that they are " characters (and that's all it checks).
|
364
364
|
# If they are not, it will blindly surround that argument with " characters. It won't do this
|
@@ -381,10 +381,10 @@ function Run-RubyCommand($command, $argList) {
|
|
381
381
|
# Command line:
|
382
382
|
# "C:\Program Files (x86)\PowerShell Community Extensions\Pscx3\Pscx\Apps\EchoArgs.exe" "foo '' bar "baz"" "foo '' bar "baz""
|
383
383
|
#
|
384
|
-
# $x = "abc'123'nospace`"
|
384
|
+
# $x = "abc'123'nospace`"lol`"!!!"
|
385
385
|
# & EchoArgs @($x, $x)
|
386
386
|
# Command line:
|
387
|
-
# "C:\Program Files (x86)\PowerShell Community Extensions\Pscx3\Pscx\Apps\EchoArgs.exe" abc'123'nospace"
|
387
|
+
# "C:\Program Files (x86)\PowerShell Community Extensions\Pscx3\Pscx\Apps\EchoArgs.exe" abc'123'nospace"lol"!!! abc'123'nospace"lol"!!!
|
388
388
|
#
|
389
389
|
# $x = "`"`"Look ma! Tonnes of spaces! 'foo' 'bar'`"`""
|
390
390
|
# & EchoArgs @($x, $x)
|
@@ -358,7 +358,7 @@ function Run-RubyCommand($command, $argList) {
|
|
358
358
|
# When arguments come into this method, the standard PS rules for interpreting cmdlet arguments
|
359
359
|
# apply. When using & (call operator) and providing an array of arguments, powershell (verified
|
360
360
|
# on PS 4.0 on Windows Server 2012R2) will not evaluate them but (contrary to documentation),
|
361
|
-
# it will still marginally interpret them. The
|
361
|
+
# it will still marginally interpret them. The behavior of PS 5.0 seems to be different but
|
362
362
|
# ignore that for now. If any of the provided arguments has a space in it, powershell checks
|
363
363
|
# the first and last character to ensure that they are " characters (and that's all it checks).
|
364
364
|
# If they are not, it will blindly surround that argument with " characters. It won't do this
|
@@ -381,10 +381,10 @@ function Run-RubyCommand($command, $argList) {
|
|
381
381
|
# Command line:
|
382
382
|
# "C:\Program Files (x86)\PowerShell Community Extensions\Pscx3\Pscx\Apps\EchoArgs.exe" "foo '' bar "baz"" "foo '' bar "baz""
|
383
383
|
#
|
384
|
-
# $x = "abc'123'nospace`"
|
384
|
+
# $x = "abc'123'nospace`"lol`"!!!"
|
385
385
|
# & EchoArgs @($x, $x)
|
386
386
|
# Command line:
|
387
|
-
# "C:\Program Files (x86)\PowerShell Community Extensions\Pscx3\Pscx\Apps\EchoArgs.exe" abc'123'nospace"
|
387
|
+
# "C:\Program Files (x86)\PowerShell Community Extensions\Pscx3\Pscx\Apps\EchoArgs.exe" abc'123'nospace"lol"!!! abc'123'nospace"lol"!!!
|
388
388
|
#
|
389
389
|
# $x = "`"`"Look ma! Tonnes of spaces! 'foo' 'bar'`"`""
|
390
390
|
# & EchoArgs @($x, $x)
|
@@ -232,8 +232,8 @@ class Chef::Application::Apply < Chef::Application
|
|
232
232
|
Chef::Application.fatal!("#{e.class}: #{e.message}", e)
|
233
233
|
end
|
234
234
|
|
235
|
-
|
236
|
-
def run(enforce_license
|
235
|
+
# Get this party started
|
236
|
+
def run(enforce_license: false)
|
237
237
|
reconfigure
|
238
238
|
check_license_acceptance if enforce_license
|
239
239
|
run_application
|
@@ -363,7 +363,7 @@ class Chef::Application::Base < Chef::Application
|
|
363
363
|
Chef::Log.trace("Download recipes tarball from #{url} to #{path}")
|
364
364
|
if File.exist?(url)
|
365
365
|
FileUtils.cp(url, path)
|
366
|
-
elsif
|
366
|
+
elsif URI.regexp.match?(url)
|
367
367
|
File.open(path, "wb") do |f|
|
368
368
|
open(url) do |r|
|
369
369
|
f.write(r.read)
|
@@ -39,7 +39,7 @@ class Chef::Application::Client < Chef::Application::Base
|
|
39
39
|
long: "--daemonize [WAIT]",
|
40
40
|
description: "Daemonize the process. Accepts an optional integer which is the " \
|
41
41
|
"number of seconds to wait before the first daemonized run.",
|
42
|
-
proc: lambda { |wait|
|
42
|
+
proc: lambda { |wait| /^\d+$/.match?(wait) ? wait.to_i : true }
|
43
43
|
end
|
44
44
|
|
45
45
|
option :pid_file,
|
@@ -139,8 +139,8 @@ class Chef
|
|
139
139
|
def notify_on_deprecation(message)
|
140
140
|
Chef.deprecated(:exit_code, message)
|
141
141
|
rescue Chef::Exceptions::DeprecatedFeatureError
|
142
|
-
|
143
|
-
|
142
|
+
# Have to rescue this, otherwise this unhandled error preempts
|
143
|
+
# the current exit code assignment.
|
144
144
|
end
|
145
145
|
|
146
146
|
def non_standard_exit_code_warning(exit_code)
|
@@ -204,7 +204,7 @@ class Chef
|
|
204
204
|
@memory_store.create(path, name, data, *options)
|
205
205
|
|
206
206
|
elsif path[0] == "cookbooks" && path.length == 2
|
207
|
-
|
207
|
+
# Do nothing. The entry gets created when the cookbook is created.
|
208
208
|
|
209
209
|
# /policy_groups/GROUP/policies/NAME
|
210
210
|
elsif path[0] == "policy_groups" && path[2] == "policies"
|
@@ -724,8 +724,8 @@ class Chef
|
|
724
724
|
path[-1] = "#{path[-1]}.json"
|
725
725
|
end
|
726
726
|
|
727
|
-
|
728
|
-
|
727
|
+
# /acls/containers|nodes|... do NOT drop into the next elsif, and do
|
728
|
+
# not get .json appended
|
729
729
|
|
730
730
|
# /nodes|clients|.../x.json
|
731
731
|
elsif path.length == 2
|
@@ -55,7 +55,7 @@ class Chef
|
|
55
55
|
base_name = remove_dot_json(entry.name)
|
56
56
|
if object["raw_data"]["id"] != base_name
|
57
57
|
yield("ID in #{entry.path_for_printing} must be '#{base_name}' (is '#{object["raw_data"]["id"]}')")
|
58
|
-
elsif entry.parent.name
|
58
|
+
elsif RESERVED_NAMES.match?(entry.parent.name)
|
59
59
|
yield("Data bag name ('#{entry.parent.name}') must not match #{RESERVED_NAMES.inspect}")
|
60
60
|
end
|
61
61
|
end
|
@@ -60,7 +60,7 @@ class Chef
|
|
60
60
|
AclDir.new(entity_type, self)
|
61
61
|
end
|
62
62
|
end
|
63
|
-
@children << AclEntry.new("organization.json", self, true) # the org acl is retrieved as GET /organizations/ORGNAME/
|
63
|
+
@children << AclEntry.new("organization.json", self, true) # the org acl is retrieved as GET /organizations/ORGNAME/ANYTHING/_acl
|
64
64
|
end
|
65
65
|
@children
|
66
66
|
end
|
@@ -71,7 +71,7 @@ class Chef
|
|
71
71
|
# Children are foo.json and bar.json in this case.
|
72
72
|
#
|
73
73
|
def children
|
74
|
-
|
74
|
+
# Grab the names of the children, append json, and make child entries
|
75
75
|
@children ||= root.get_json(api_path).keys.sort.map do |key|
|
76
76
|
make_child_entry(key, true)
|
77
77
|
end
|
@@ -19,7 +19,7 @@ class Chef
|
|
19
19
|
def children
|
20
20
|
result = []
|
21
21
|
seen = {}
|
22
|
-
|
22
|
+
# If multiple things have the same name, the first one wins.
|
23
23
|
multiplexed_dirs.each do |dir|
|
24
24
|
dir.children.each do |child|
|
25
25
|
if seen[child.name]
|
@@ -235,7 +235,7 @@ class Chef
|
|
235
235
|
# The order of these checks is important, as well, to be thread safe.
|
236
236
|
# 1. If @unconsumed_input.empty? is true, then we will never have any more
|
237
237
|
# work legitimately picked up.
|
238
|
-
# 2. If @in_process == 0, then there is no work in process, and because
|
238
|
+
# 2. If @in_process == 0, then there is no work in process, and because of when unconsumed_input is empty, it will never go back up, because
|
239
239
|
# this is called after the input enumerator is finished. Note that switching #2 and #1
|
240
240
|
# could cause a race, because in_process is incremented *before* consuming input.
|
241
241
|
# 3. If @unconsumed_output.empty? is true, then we are done with outputs.
|
@@ -71,9 +71,9 @@ class Chef
|
|
71
71
|
# part that actually exists. The paths operated on here are not Chef-FS paths.
|
72
72
|
# These are OS paths that may contain symlinks but may not also fully exist.
|
73
73
|
#
|
74
|
-
# If /x is a symlink to /
|
75
|
-
# PathUtils.realest_path('/x/y/z') == '/
|
76
|
-
# PathUtils.realest_path('/x/*/z') == '/
|
74
|
+
# If /x is a symlink to /foo_bar, and has no subdirectories, then:
|
75
|
+
# PathUtils.realest_path('/x/y/z') == '/foo_bar/y/z'
|
76
|
+
# PathUtils.realest_path('/x/*/z') == '/foo_bar/*/z'
|
77
77
|
# PathUtils.realest_path('/*/y/z') == '/*/y/z'
|
78
78
|
#
|
79
79
|
# TODO: Move this to wherever util/path_helper is these days.
|
@@ -118,7 +118,7 @@ class Chef
|
|
118
118
|
|
119
119
|
if ancestor.length == path.length
|
120
120
|
""
|
121
|
-
elsif path[ancestor.length, 1]
|
121
|
+
elsif /#{PathUtils.regexp_path_separator}/.match?(path[ancestor.length, 1])
|
122
122
|
path[ancestor.length + 1..-1]
|
123
123
|
else
|
124
124
|
nil
|
@@ -50,7 +50,7 @@ class Chef
|
|
50
50
|
ignore_globs = []
|
51
51
|
if @ignore_file && readable_file_or_symlink?(@ignore_file)
|
52
52
|
File.foreach(@ignore_file) do |line|
|
53
|
-
ignore_globs << line.strip unless line
|
53
|
+
ignore_globs << line.strip unless COMMENTS_AND_WHITESPACE.match?(line)
|
54
54
|
end
|
55
55
|
else
|
56
56
|
Chef::Log.debug("No chefignore file found. No files will be ignored!")
|
@@ -27,7 +27,7 @@ class Chef
|
|
27
27
|
# and throws the rest away then re-builds the list of files on the
|
28
28
|
# disk. This is due to the manifest not having the on-disk file
|
29
29
|
# locations, since in the chef-client case, that information is
|
30
|
-
#
|
30
|
+
# nonsensical.
|
31
31
|
class FileSystemFileVendor < FileVendor
|
32
32
|
|
33
33
|
attr_reader :cookbook_name
|
@@ -357,7 +357,7 @@ class Chef
|
|
357
357
|
# Array<String> - array of files or globs to eagerly load, otherwise it is treated like `false`
|
358
358
|
#
|
359
359
|
# @params arg [Array,String,TrueClass,FalseClass]
|
360
|
-
# @params [Array,TrueClass,
|
360
|
+
# @params [Array,TrueClass,FalseClass]
|
361
361
|
def eager_load_libraries(arg = nil)
|
362
362
|
set_or_return(
|
363
363
|
:eager_load_libraries,
|
@@ -391,7 +391,7 @@ class Chef
|
|
391
391
|
def recipes_from_cookbook_version(cookbook)
|
392
392
|
cookbook.fully_qualified_recipe_names.map do |recipe_name|
|
393
393
|
unqualified_name =
|
394
|
-
if
|
394
|
+
if /::default$/.match?(recipe_name)
|
395
395
|
name.to_s
|
396
396
|
else
|
397
397
|
recipe_name
|
data/lib/chef/cookbook_loader.rb
CHANGED
@@ -138,7 +138,7 @@ class Chef
|
|
138
138
|
cookbooks_by_name.values
|
139
139
|
end
|
140
140
|
|
141
|
-
# This method creates tmp directory and copies all cookbooks into it and creates cookbook
|
141
|
+
# This method creates tmp directory and copies all cookbooks into it and creates cookbook loader object which points to tmp directory
|
142
142
|
def self.copy_to_tmp_dir_from_array(cookbooks)
|
143
143
|
tmp_cookbook_file = Tempfile.new("tmp_working_dir_path")
|
144
144
|
tmp_cookbook_file.close
|
@@ -44,7 +44,7 @@ class Chef
|
|
44
44
|
# cookbook_version in the "manifest" format, or #to_json to get a JSON
|
45
45
|
# representation of the cookbook_version.
|
46
46
|
#
|
47
|
-
# The
|
47
|
+
# The interface for this behavior is expected to change as we implement new
|
48
48
|
# manifest formats. The entire class should be considered a private API for
|
49
49
|
# now.
|
50
50
|
#
|
@@ -147,7 +147,7 @@ class Chef
|
|
147
147
|
class << res
|
148
148
|
alias :to_s :body
|
149
149
|
|
150
|
-
#
|
150
|
+
# BUG this makes the response compatible with what response_steps expects to test headers (response.headers[] -> response[])
|
151
151
|
def headers # rubocop:disable Lint/NestedMethodDefinition
|
152
152
|
self
|
153
153
|
end
|
@@ -358,10 +358,10 @@ class Chef
|
|
358
358
|
|
359
359
|
# extract the preference part from the path.
|
360
360
|
if manifest_record_path =~ %r{(#{Regexp.escape(segment.to_s)}/[^/]+/#{Regexp.escape(dirname)})/.+$}
|
361
|
-
|
362
|
-
|
363
|
-
|
364
|
-
|
361
|
+
# Note the specificity_dirname includes the segment and
|
362
|
+
# dirname argument as above, which is what
|
363
|
+
# preferences_for_path returns. It could be
|
364
|
+
# "files/ubuntu-9.10/dirname", for example.
|
365
365
|
specificity_dirname = $1
|
366
366
|
|
367
367
|
# Record the specificity_dirname only if it's in the list of
|
@@ -392,7 +392,7 @@ class Chef
|
|
392
392
|
platform, version = Chef::Platform.find_platform_and_version(node)
|
393
393
|
rescue ArgumentError => e
|
394
394
|
# Skip platform/version if they were not found by find_platform_and_version
|
395
|
-
if
|
395
|
+
if /Cannot find a (?:platform|version)/.match?(e.message)
|
396
396
|
platform = "/unknown_platform/"
|
397
397
|
version = "/unknown_platform_version/"
|
398
398
|
else
|
@@ -527,7 +527,7 @@ class Chef
|
|
527
527
|
cb["version"]
|
528
528
|
end
|
529
529
|
rescue Net::HTTPClientException => e
|
530
|
-
if e.to_s
|
530
|
+
if /^404/.match?(e.to_s)
|
531
531
|
Chef::Log.error("Cannot find a cookbook named #{cookbook_name}")
|
532
532
|
nil
|
533
533
|
else
|
@@ -566,7 +566,7 @@ class Chef
|
|
566
566
|
def find_preferred_manifest_record(node, segment, filename)
|
567
567
|
preferences = preferences_for_path(node, segment, filename)
|
568
568
|
|
569
|
-
# in order of
|
569
|
+
# in order of preference, look for the filename in the manifest
|
570
570
|
preferences.find { |preferred_filename| manifest_records_by_path[preferred_filename] }
|
571
571
|
end
|
572
572
|
|
data/lib/chef/data_bag.rb
CHANGED
@@ -36,10 +36,10 @@ class Chef
|
|
36
36
|
RESERVED_NAMES = /^(node|role|environment|client)$/.freeze
|
37
37
|
|
38
38
|
def self.validate_name!(name)
|
39
|
-
unless name
|
39
|
+
unless VALID_NAME.match?(name)
|
40
40
|
raise Exceptions::InvalidDataBagName, "DataBags must have a name matching #{VALID_NAME.inspect}, you gave #{name.inspect}"
|
41
41
|
end
|
42
|
-
if name
|
42
|
+
if RESERVED_NAMES.match?(name)
|
43
43
|
raise Exceptions::InvalidDataBagName, "DataBags may not have a name matching #{RESERVED_NAMES.inspect}, you gave #{name.inspect}"
|
44
44
|
end
|
45
45
|
end
|
@@ -94,7 +94,7 @@ class Chef
|
|
94
94
|
names = []
|
95
95
|
paths.each do |path|
|
96
96
|
unless File.directory?(path)
|
97
|
-
raise Chef::Exceptions::InvalidDataBagPath, "Data bag path '#{path}'
|
97
|
+
raise Chef::Exceptions::InvalidDataBagPath, "Data bag path '#{path}' not found. Please create this directory."
|
98
98
|
end
|
99
99
|
|
100
100
|
names += Dir.glob(File.join(
|
@@ -122,7 +122,7 @@ class Chef
|
|
122
122
|
data_bag = {}
|
123
123
|
paths.each do |path|
|
124
124
|
unless File.directory?(path)
|
125
|
-
raise Chef::Exceptions::InvalidDataBagPath, "Data bag path '#{path}'
|
125
|
+
raise Chef::Exceptions::InvalidDataBagPath, "Data bag path '#{path}' not found. Please create this directory."
|
126
126
|
end
|
127
127
|
|
128
128
|
Dir.glob(File.join(Chef::Util::PathHelper.escape_glob_dir(path, name.to_s), "*.json")).inject({}) do |bag, f|
|