chef 12.10.24 → 12.11.18
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/CONTRIBUTING.md +3 -38
- data/Gemfile +6 -11
- data/LICENSE +201 -201
- data/README.md +11 -1
- data/VERSION +1 -1
- data/acceptance/.bundle/config +2 -0
- data/acceptance/Gemfile.lock +27 -26
- data/acceptance/basics/.kitchen/logs/chef-current-install-ubuntu-1404.log +2 -0
- data/acceptance/basics/.kitchen/logs/kitchen.log +3 -0
- data/acceptance/data-collector/.acceptance/acceptance-cookbook/.gitignore +2 -0
- data/acceptance/data-collector/.acceptance/acceptance-cookbook/metadata.rb +3 -0
- data/acceptance/data-collector/.acceptance/acceptance-cookbook/recipes/destroy.rb +2 -0
- data/acceptance/data-collector/.acceptance/acceptance-cookbook/recipes/provision.rb +2 -0
- data/acceptance/data-collector/.acceptance/acceptance-cookbook/recipes/verify.rb +2 -0
- data/acceptance/data-collector/.acceptance/data-collector-test/.gitignore +16 -0
- data/acceptance/data-collector/.acceptance/data-collector-test/Berksfile +3 -0
- data/acceptance/data-collector/.acceptance/data-collector-test/files/default/api.rb +85 -0
- data/acceptance/data-collector/.acceptance/data-collector-test/files/default/apigemfile +3 -0
- data/acceptance/data-collector/.acceptance/data-collector-test/files/default/client-rb-both-mode.rb +4 -0
- data/acceptance/data-collector/.acceptance/data-collector-test/files/default/client-rb-client-mode.rb +4 -0
- data/acceptance/data-collector/.acceptance/data-collector-test/files/default/client-rb-no-endpoint.rb +2 -0
- data/acceptance/data-collector/.acceptance/data-collector-test/files/default/client-rb-solo-mode.rb +4 -0
- data/acceptance/data-collector/.acceptance/data-collector-test/files/default/config.ru +2 -0
- data/acceptance/data-collector/.acceptance/data-collector-test/metadata.rb +7 -0
- data/acceptance/data-collector/.acceptance/data-collector-test/recipes/default.rb +38 -0
- data/acceptance/data-collector/.kitchen.yml +9 -0
- data/acceptance/data-collector/Berksfile +3 -0
- data/acceptance/data-collector/Berksfile.lock +6 -0
- data/acceptance/data-collector/test/integration/default/serverspec/default_spec.rb +251 -0
- data/acceptance/fips/.kitchen/logs/fips-integration-centos-6.log +3 -0
- data/acceptance/fips/.kitchen/logs/fips-integration-windows-2012r2.log +3 -0
- data/acceptance/fips/.kitchen/logs/fips-unit-functional-centos-6.log +3 -0
- data/acceptance/fips/.kitchen/logs/fips-unit-functional-windows-2012r2.log +3 -0
- data/acceptance/fips/.kitchen/logs/kitchen.log +6 -0
- data/acceptance/fips/test/integration/fips-integration/serverspec/fips-integration_spec.rb +2 -1
- data/acceptance/top-cookbooks/.kitchen.docker.yml +1 -4
- data/acceptance/trivial/.kitchen/logs/chef-current-install-windows-2012r2.log +2 -0
- data/acceptance/trivial/.kitchen/logs/kitchen.log +3 -0
- data/acceptance/windows-service/.kitchen/logs/chef-windows-service-windows-2012r2.log +2 -0
- data/acceptance/windows-service/.kitchen/logs/kitchen.log +3 -0
- data/bin/chef-apply +0 -0
- data/bin/chef-client +0 -0
- data/bin/chef-shell +0 -0
- data/bin/chef-solo +0 -0
- data/bin/knife +0 -0
- data/chef.gemspec +1 -0
- data/distro/common/html/_sources/ctl_chef_client.txt +35 -35
- data/distro/common/html/_sources/ctl_chef_server.txt +341 -341
- data/distro/common/html/_sources/ctl_chef_shell.txt +15 -15
- data/distro/common/html/_sources/ctl_chef_solo.txt +25 -25
- data/distro/common/html/_sources/index.txt +135 -135
- data/distro/common/html/_sources/knife.txt +74 -74
- data/distro/common/html/_sources/knife_bootstrap.txt +56 -56
- data/distro/common/html/_sources/knife_client.txt +150 -150
- data/distro/common/html/_sources/knife_common_options.txt +6 -6
- data/distro/common/html/_sources/knife_configure.txt +29 -29
- data/distro/common/html/_sources/knife_cookbook.txt +236 -236
- data/distro/common/html/_sources/knife_cookbook_site.txt +157 -157
- data/distro/common/html/_sources/knife_data_bag.txt +159 -159
- data/distro/common/html/_sources/knife_delete.txt +26 -26
- data/distro/common/html/_sources/knife_deps.txt +61 -61
- data/distro/common/html/_sources/knife_diff.txt +34 -34
- data/distro/common/html/_sources/knife_download.txt +44 -44
- data/distro/common/html/_sources/knife_edit.txt +26 -26
- data/distro/common/html/_sources/knife_environment.txt +158 -158
- data/distro/common/html/_sources/knife_exec.txt +47 -47
- data/distro/common/html/_sources/knife_index_rebuild.txt +20 -20
- data/distro/common/html/_sources/knife_list.txt +33 -33
- data/distro/common/html/_sources/knife_node.txt +250 -250
- data/distro/common/html/_sources/knife_raw.txt +35 -35
- data/distro/common/html/_sources/knife_recipe_list.txt +23 -23
- data/distro/common/html/_sources/knife_role.txt +157 -157
- data/distro/common/html/_sources/knife_search.txt +53 -53
- data/distro/common/html/_sources/knife_serve.txt +18 -18
- data/distro/common/html/_sources/knife_show.txt +26 -26
- data/distro/common/html/_sources/knife_ssh.txt +43 -43
- data/distro/common/html/_sources/knife_ssl_check.txt +41 -41
- data/distro/common/html/_sources/knife_ssl_fetch.txt +41 -41
- data/distro/common/html/_sources/knife_status.txt +37 -37
- data/distro/common/html/_sources/knife_tag.txt +69 -69
- data/distro/common/html/_sources/knife_upload.txt +49 -49
- data/distro/common/html/_sources/knife_user.txt +127 -127
- data/distro/common/html/_sources/knife_using.txt +43 -43
- data/distro/common/html/_sources/knife_xargs.txt +30 -30
- data/distro/common/html/_static/guide.css +504 -504
- data/distro/common/html/_static/pygments.css +61 -61
- data/distro/common/html/_static/underscore.js +31 -31
- data/distro/common/html/ctl_chef_client.html +269 -269
- data/distro/common/html/ctl_chef_server.html +727 -727
- data/distro/common/html/ctl_chef_shell.html +162 -162
- data/distro/common/html/ctl_chef_solo.html +193 -193
- data/distro/common/html/index.html +201 -201
- data/distro/common/html/knife.html +169 -169
- data/distro/common/html/knife_bootstrap.html +284 -284
- data/distro/common/html/knife_client.html +284 -284
- data/distro/common/html/knife_common_options.html +95 -95
- data/distro/common/html/knife_configure.html +104 -104
- data/distro/common/html/knife_cookbook.html +486 -486
- data/distro/common/html/knife_data_bag.html +373 -373
- data/distro/common/html/knife_delete.html +92 -92
- data/distro/common/html/knife_deps.html +142 -142
- data/distro/common/html/knife_diff.html +122 -122
- data/distro/common/html/knife_download.html +144 -144
- data/distro/common/html/knife_edit.html +88 -88
- data/distro/common/html/knife_environment.html +325 -325
- data/distro/common/html/knife_exec.html +219 -219
- data/distro/common/html/knife_index_rebuild.html +82 -82
- data/distro/common/html/knife_list.html +113 -113
- data/distro/common/html/knife_node.html +457 -457
- data/distro/common/html/knife_raw.html +109 -109
- data/distro/common/html/knife_recipe_list.html +90 -90
- data/distro/common/html/knife_role.html +294 -294
- data/distro/common/html/knife_search.html +202 -202
- data/distro/common/html/knife_serve.html +78 -78
- data/distro/common/html/knife_show.html +103 -103
- data/distro/common/html/knife_ssh.html +176 -176
- data/distro/common/html/knife_ssl_check.html +150 -150
- data/distro/common/html/knife_ssl_fetch.html +150 -150
- data/distro/common/html/knife_status.html +143 -143
- data/distro/common/html/knife_tag.html +137 -137
- data/distro/common/html/knife_upload.html +152 -152
- data/distro/common/html/knife_user.html +241 -241
- data/distro/common/html/knife_using.html +209 -209
- data/distro/common/html/knife_xargs.html +121 -121
- data/distro/common/html/search.html +81 -81
- data/distro/common/man/man1/README.md +58 -58
- data/distro/common/man/man1/chef-shell.1 +194 -194
- data/distro/common/man/man1/knife-bootstrap.1 +215 -215
- data/distro/common/man/man1/knife-client.1 +443 -443
- data/distro/common/man/man1/knife-configure.1 +161 -161
- data/distro/common/man/man1/knife-cookbook.1 +770 -770
- data/distro/common/man/man1/knife-data-bag.1 +617 -617
- data/distro/common/man/man1/knife-delete.1 +127 -127
- data/distro/common/man/man1/knife-deps.1 +246 -246
- data/distro/common/man/man1/knife-diff.1 +226 -226
- data/distro/common/man/man1/knife-download.1 +258 -258
- data/distro/common/man/man1/knife-edit.1 +121 -121
- data/distro/common/man/man1/knife-environment.1 +508 -508
- data/distro/common/man/man1/knife-exec.1 +362 -362
- data/distro/common/man/man1/knife-index-rebuild.1 +63 -63
- data/distro/common/man/man1/knife-list.1 +174 -174
- data/distro/common/man/man1/knife-node.1 +716 -716
- data/distro/common/man/man1/knife-raw.1 +172 -172
- data/distro/common/man/man1/knife-recipe-list.1 +85 -85
- data/distro/common/man/man1/knife-role.1 +426 -426
- data/distro/common/man/man1/knife-search.1 +359 -359
- data/distro/common/man/man1/knife-serve.1 +109 -109
- data/distro/common/man/man1/knife-show.1 +160 -160
- data/distro/common/man/man1/knife-ssh.1 +284 -284
- data/distro/common/man/man1/knife-ssl-check.1 +207 -207
- data/distro/common/man/man1/knife-ssl-fetch.1 +207 -207
- data/distro/common/man/man1/knife-status.1 +234 -234
- data/distro/common/man/man1/knife-tag.1 +189 -189
- data/distro/common/man/man1/knife-upload.1 +280 -280
- data/distro/common/man/man1/knife-user.1 +356 -356
- data/distro/common/man/man1/knife-xargs.1 +189 -189
- data/distro/common/man/man1/knife.1 +332 -332
- data/distro/common/man/man8/chef-apply.8 +86 -86
- data/distro/common/man/man8/chef-client.8 +398 -398
- data/distro/common/man/man8/chef-solo.8 +260 -260
- data/distro/common/markdown/README +3 -3
- data/lib/chef/application.rb +14 -9
- data/lib/chef/application/apply.rb +5 -5
- data/lib/chef/application/client.rb +3 -3
- data/lib/chef/application/exit_code.rb +226 -0
- data/lib/chef/application/solo.rb +37 -7
- data/lib/chef/application/windows_service.rb +3 -3
- data/lib/chef/chef_fs/command_line.rb +7 -0
- data/lib/chef/chef_fs/config.rb +1 -1
- data/lib/chef/chef_fs/data_handler/data_handler_base.rb +11 -10
- data/lib/chef/chef_fs/data_handler/environment_data_handler.rb +1 -1
- data/lib/chef/chef_fs/data_handler/role_data_handler.rb +1 -1
- data/lib/chef/chef_fs/file_system.rb +15 -13
- data/lib/chef/chef_fs/file_system/base_fs_object.rb +4 -0
- data/lib/chef/chef_fs/file_system/chef_server/acl_dir.rb +1 -1
- data/lib/chef/chef_fs/file_system/chef_server/acl_entry.rb +9 -0
- data/lib/chef/chef_fs/file_system/chef_server/data_bag_dir.rb +6 -0
- data/lib/chef/chef_fs/file_system/chef_server/data_bag_entry.rb +19 -0
- data/lib/chef/chef_fs/file_system/chef_server/environments_dir.rb +1 -1
- data/lib/chef/chef_fs/file_system/chef_server/nodes_dir.rb +1 -1
- data/lib/chef/chef_fs/file_system/chef_server/org_entry.rb +4 -0
- data/lib/chef/chef_fs/file_system/chef_server/organization_invites_entry.rb +4 -0
- data/lib/chef/chef_fs/file_system/chef_server/organization_members_entry.rb +4 -0
- data/lib/chef/chef_fs/file_system/chef_server/policy_revision_entry.rb +4 -0
- data/lib/chef/chef_fs/file_system/chef_server/rest_list_dir.rb +3 -3
- data/lib/chef/chef_fs/file_system/chef_server/rest_list_entry.rb +15 -4
- data/lib/chef/chef_fs/file_system/exceptions.rb +7 -0
- data/lib/chef/chef_fs/file_system/multiplexed_dir.rb +2 -2
- data/lib/chef/chef_fs/file_system/nonexistent_fs_object.rb +0 -4
- data/lib/chef/chef_fs/file_system/repository/acl.rb +7 -0
- data/lib/chef/chef_fs/file_system/repository/acls_sub_dir.rb +0 -4
- data/lib/chef/chef_fs/file_system/repository/base_file.rb +36 -4
- data/lib/chef/chef_fs/file_system/repository/chef_repository_file_system_cookbook_entry.rb +4 -0
- data/lib/chef/chef_fs/file_system/repository/client_keys_sub_dir.rb +0 -4
- data/lib/chef/chef_fs/file_system/repository/clients_dir.rb +0 -3
- data/lib/chef/chef_fs/file_system/repository/containers_dir.rb +0 -4
- data/lib/chef/chef_fs/file_system/repository/directory.rb +4 -0
- data/lib/chef/chef_fs/file_system/repository/environments_dir.rb +0 -4
- data/lib/chef/chef_fs/file_system/repository/groups_dir.rb +0 -4
- data/lib/chef/chef_fs/file_system/repository/nodes_dir.rb +0 -4
- data/lib/chef/chef_fs/file_system/repository/policy_groups_dir.rb +0 -4
- data/lib/chef/chef_fs/file_system/repository/roles_dir.rb +0 -4
- data/lib/chef/chef_fs/file_system/repository/users_dir.rb +0 -4
- data/lib/chef/client.rb +11 -3
- data/lib/chef/config_fetcher.rb +4 -4
- data/lib/chef/cookbook/gem_installer.rb +1 -0
- data/lib/chef/cookbook/synchronizer.rb +1 -1
- data/lib/chef/data_bag.rb +2 -2
- data/lib/chef/data_bag_item.rb +1 -1
- data/lib/chef/data_collector.rb +345 -0
- data/lib/chef/data_collector/messages.rb +125 -0
- data/lib/chef/data_collector/messages/helpers.rb +161 -0
- data/lib/chef/data_collector/resource_report.rb +84 -0
- data/lib/chef/decorator.rb +81 -0
- data/lib/chef/decorator/lazy.rb +60 -0
- data/lib/chef/decorator/lazy_array.rb +59 -0
- data/lib/chef/deprecation/provider/remote_file.rb +1 -1
- data/lib/chef/dsl/core.rb +19 -11
- data/lib/chef/dsl/platform_introspection.rb +16 -0
- data/lib/chef/dsl/recipe.rb +15 -9
- data/lib/chef/dsl/universal.rb +50 -0
- data/lib/chef/environment.rb +2 -2
- data/lib/chef/exceptions.rb +19 -4
- data/lib/chef/handler.rb +33 -0
- data/lib/chef/knife/cookbook_show.rb +6 -10
- data/lib/chef/knife/cookbook_site_install.rb +7 -2
- data/lib/chef/knife/help_topics.rb +4 -4
- data/lib/chef/knife/list.rb +1 -2
- data/lib/chef/knife/ssl_check.rb +2 -1
- data/lib/chef/monkey_patches/win32/registry.rb +11 -0
- data/lib/chef/nil_argument.rb +3 -3
- data/lib/chef/node.rb +2 -2
- data/lib/chef/platform/rebooter.rb +13 -2
- data/lib/chef/policy_builder/dynamic.rb +1 -1
- data/lib/chef/policy_builder/expand_node_object.rb +3 -3
- data/lib/chef/policy_builder/policyfile.rb +1 -1
- data/lib/chef/provider/git.rb +43 -41
- data/lib/chef/provider/lwrp_base.rb +0 -1
- data/lib/chef/provider/osx_profile.rb +2 -3
- data/lib/chef/provider/package.rb +51 -13
- data/lib/chef/provider/package/apt.rb +97 -103
- data/lib/chef/provider/package/chocolatey.rb +9 -10
- data/lib/chef/provider/package/dpkg.rb +2 -2
- data/lib/chef/provider/package/portage.rb +1 -1
- data/lib/chef/provider/package/rubygems.rb +8 -12
- data/lib/chef/provider/package/yum.rb +4 -959
- data/lib/chef/provider/package/yum/rpm_utils.rb +642 -0
- data/lib/chef/provider/package/{yum-dump.py → yum/yum-dump.py} +0 -0
- data/lib/chef/provider/package/yum/yum_cache.rb +376 -0
- data/lib/chef/provider/resource_update.rb +52 -52
- data/lib/chef/provider/systemd_unit.rb +238 -0
- data/lib/chef/providers.rb +1 -0
- data/lib/chef/reserved_names.rb +9 -9
- data/lib/chef/resource.rb +2 -7
- data/lib/chef/resource/file.rb +6 -1
- data/lib/chef/resource/systemd_unit.rb +63 -0
- data/lib/chef/resources.rb +1 -0
- data/lib/chef/sandbox.rb +20 -20
- data/lib/chef/shell/shell_session.rb +3 -3
- data/lib/chef/version.rb +1 -1
- data/lib/chef/win32/system.rb +0 -0
- data/spec/data/apt/chef-integration-test-1.0/debian/changelog +5 -5
- data/spec/data/apt/chef-integration-test-1.0/debian/compat +1 -1
- data/spec/data/apt/chef-integration-test-1.0/debian/control +13 -13
- data/spec/data/apt/chef-integration-test-1.0/debian/files +1 -1
- data/spec/data/apt/chef-integration-test-1.0/debian/rules +13 -13
- data/spec/data/apt/chef-integration-test-1.0/debian/source/format +1 -1
- data/spec/data/apt/chef-integration-test-1.1/debian/changelog +11 -11
- data/spec/data/apt/chef-integration-test-1.1/debian/compat +1 -1
- data/spec/data/apt/chef-integration-test-1.1/debian/control +13 -13
- data/spec/data/apt/chef-integration-test-1.1/debian/files +1 -1
- data/spec/data/apt/chef-integration-test-1.1/debian/rules +13 -13
- data/spec/data/apt/chef-integration-test-1.1/debian/source/format +1 -1
- data/spec/data/apt/chef-integration-test2-1.0/debian/rules +0 -0
- data/spec/data/apt/chef-integration-test_1.0-1_amd64.changes +22 -22
- data/spec/data/apt/chef-integration-test_1.1-1_amd64.changes +22 -22
- data/spec/data/apt/var/www/apt/conf/distributions +7 -7
- data/spec/data/apt/var/www/apt/conf/incoming +4 -4
- data/spec/data/apt/var/www/apt/conf/pulls +3 -3
- data/spec/data/apt/var/www/apt/db/version +4 -4
- data/spec/data/apt/var/www/apt/dists/sid/Release +19 -19
- data/spec/data/apt/var/www/apt/dists/sid/main/binary-amd64/Packages +16 -16
- data/spec/data/apt/var/www/apt/dists/sid/main/binary-amd64/Release +5 -5
- data/spec/data/bootstrap/encrypted_data_bag_secret +1 -1
- data/spec/data/bootstrap/no_proxy.erb +2 -2
- data/spec/data/bootstrap/secret.erb +9 -9
- data/spec/data/bootstrap/test-hints.erb +12 -12
- data/spec/data/bootstrap/test.erb +1 -1
- data/spec/data/cb_version_cookbooks/tatft/README.rdoc +2 -2
- data/spec/data/cb_version_cookbooks/tatft/attributes/default.rb +1 -1
- data/spec/data/checksum_cache/chef-file--tmp-chef-rendered-template20100929-10863-600hhz-0 +1 -1
- data/spec/data/checksum_cache/chef-file--tmp-chef-rendered-template20100929-10863-ahd2gq-0 +1 -1
- data/spec/data/checksum_cache/chef-file--tmp-chef-rendered-template20100929-10863-api8ux-0 +1 -1
- data/spec/data/checksum_cache/chef-file--tmp-chef-rendered-template20100929-10863-b0r1m1-0 +1 -1
- data/spec/data/checksum_cache/chef-file--tmp-chef-rendered-template20100929-10863-bfygsi-0 +1 -1
- data/spec/data/checksum_cache/chef-file--tmp-chef-rendered-template20100929-10863-el14l6-0 +1 -1
- data/spec/data/checksum_cache/chef-file--tmp-chef-rendered-template20100929-10863-ivrl3y-0 +1 -1
- data/spec/data/checksum_cache/chef-file--tmp-chef-rendered-template20100929-10863-kkbs85-0 +1 -1
- data/spec/data/checksum_cache/chef-file--tmp-chef-rendered-template20100929-10863-ory1ux-0 +1 -1
- data/spec/data/checksum_cache/chef-file--tmp-chef-rendered-template20100929-10863-pgsq76-0 +1 -1
- data/spec/data/checksum_cache/chef-file--tmp-chef-rendered-template20100929-10863-ra8uim-0 +1 -1
- data/spec/data/checksum_cache/chef-file--tmp-chef-rendered-template20100929-10863-t7k1g-0 +1 -1
- data/spec/data/checksum_cache/chef-file--tmp-chef-rendered-template20100929-10863-t8g0sv-0 +1 -1
- data/spec/data/checksum_cache/chef-file--tmp-chef-rendered-template20100929-10863-ufy6g3-0 +1 -1
- data/spec/data/checksum_cache/chef-file--tmp-chef-rendered-template20100929-10863-x2d6j9-0 +1 -1
- data/spec/data/checksum_cache/chef-file--tmp-chef-rendered-template20100929-10863-xi0l6h-0 +1 -1
- data/spec/data/config.rb +6 -6
- data/spec/data/cookbooks/angrybash/metadata.rb +2 -2
- data/spec/data/cookbooks/angrybash/recipes/default.rb +8 -8
- data/spec/data/cookbooks/apache2/files/default/apache2_module_conf_generate.pl +2 -2
- data/spec/data/cookbooks/apache2/metadata.rb +2 -2
- data/spec/data/cookbooks/apache2/recipes/default.rb +2 -2
- data/spec/data/cookbooks/borken/metadata.rb +2 -2
- data/spec/data/cookbooks/borken/recipes/default.rb +1 -1
- data/spec/data/cookbooks/borken/templates/default/borken.erb +1 -1
- data/spec/data/cookbooks/chefignore +8 -8
- data/spec/data/cookbooks/ignorken/files/default/not_me.rb +2 -2
- data/spec/data/cookbooks/ignorken/metadata.rb +2 -2
- data/spec/data/cookbooks/ignorken/recipes/ignoreme.rb +1 -1
- data/spec/data/cookbooks/ignorken/templates/ubuntu-12.10/not_me.rb +2 -2
- data/spec/data/cookbooks/java/files/default/java.response +1 -1
- data/spec/data/cookbooks/java/metadata.rb +2 -2
- data/spec/data/cookbooks/name-mismatch-versionnumber/README.md +4 -4
- data/spec/data/cookbooks/name-mismatch-versionnumber/metadata.rb +8 -8
- data/spec/data/cookbooks/openldap/attributes/default.rb +16 -16
- data/spec/data/cookbooks/openldap/attributes/smokey.rb +1 -1
- data/spec/data/cookbooks/openldap/definitions/client.rb +5 -5
- data/spec/data/cookbooks/openldap/definitions/server.rb +5 -5
- data/spec/data/cookbooks/openldap/files/default/.dotfile +1 -1
- data/spec/data/cookbooks/openldap/files/default/remotedir/.a_dotdir/.a_dotfile_in_a_dotdir +1 -1
- data/spec/data/cookbooks/openldap/files/default/remotedir/not_a_template.erb +2 -2
- data/spec/data/cookbooks/openldap/files/default/remotedir/remote_dir_file1.txt +2 -2
- data/spec/data/cookbooks/openldap/files/default/remotedir/remote_dir_file2.txt +2 -2
- data/spec/data/cookbooks/openldap/files/default/remotedir/remotesubdir/.a_dotfile +1 -1
- data/spec/data/cookbooks/openldap/files/default/remotedir/remotesubdir/remote_subdir_file1.txt +2 -2
- data/spec/data/cookbooks/openldap/files/default/remotedir/remotesubdir/remote_subdir_file2.txt +2 -2
- data/spec/data/cookbooks/openldap/files/default/remotedir/subdir_with_no_file_just_a_subsubdir/the_subsubdir/some_file.txt +3 -3
- data/spec/data/cookbooks/openldap/libraries/openldap.rb +4 -4
- data/spec/data/cookbooks/openldap/libraries/openldap/version.rb +3 -3
- data/spec/data/cookbooks/openldap/metadata.rb +8 -8
- data/spec/data/cookbooks/openldap/recipes/default.rb +4 -4
- data/spec/data/cookbooks/openldap/recipes/gigantor.rb +3 -3
- data/spec/data/cookbooks/openldap/recipes/one.rb +15 -15
- data/spec/data/cookbooks/openldap/recipes/return.rb +2 -2
- data/spec/data/cookbooks/openldap/templates/default/helper_test.erb +1 -1
- data/spec/data/cookbooks/openldap/templates/default/helpers_via_partial_test.erb +1 -1
- data/spec/data/cookbooks/openldap/templates/default/no_windows_line_endings.erb +4 -4
- data/spec/data/cookbooks/openldap/templates/default/openldap_variable_stuff.conf.erb +1 -1
- data/spec/data/cookbooks/openldap/templates/default/test.erb +1 -1
- data/spec/data/cookbooks/preseed/files/default/preseed-file.seed +1 -1
- data/spec/data/cookbooks/preseed/files/default/preseed-template.seed +4 -4
- data/spec/data/cookbooks/preseed/metadata.rb +2 -2
- data/spec/data/cookbooks/preseed/templates/default/preseed-template-variables.seed +1 -1
- data/spec/data/cookbooks/preseed/templates/default/preseed-template.seed +1 -1
- data/spec/data/definitions/test.rb +4 -4
- data/spec/data/environment-config.rb +4 -4
- data/spec/data/file-providers-method-snapshot-chef-11-4.json +127 -127
- data/spec/data/fileedit/hosts +4 -4
- data/spec/data/incomplete-metadata-chef-repo/incomplete-metadata/README.md +4 -4
- data/spec/data/incomplete-metadata-chef-repo/incomplete-metadata/metadata.rb +13 -13
- data/spec/data/invalid-metadata-chef-repo/invalid-metadata/README.md +4 -4
- data/spec/data/kitchen/chefignore +6 -6
- data/spec/data/kitchen/openldap/attributes/default.rb +3 -3
- data/spec/data/kitchen/openldap/attributes/robinson.rb +2 -2
- data/spec/data/kitchen/openldap/definitions/client.rb +3 -3
- data/spec/data/kitchen/openldap/definitions/drewbarrymore.rb +2 -2
- data/spec/data/kitchen/openldap/recipes/gigantor.rb +2 -2
- data/spec/data/kitchen/openldap/recipes/ignoreme.rb +2 -2
- data/spec/data/kitchen/openldap/recipes/woot.rb +3 -3
- data/spec/data/knife_subcommand/test_explicit_category.rb +6 -6
- data/spec/data/knife_subcommand/test_name_mapping.rb +4 -4
- data/spec/data/knife_subcommand/test_yourself.rb +21 -21
- data/spec/data/lwrp/providers/inline_compiler.rb +26 -26
- data/spec/data/lwrp/providers/monkey_name_printer.rb +5 -5
- data/spec/data/lwrp/providers/paint_drying_watcher.rb +7 -7
- data/spec/data/lwrp/providers/thumb_twiddler.rb +7 -7
- data/spec/data/lwrp/resources/foo.rb +4 -4
- data/spec/data/lwrp/resources_with_default_attributes/nodeattr.rb +1 -1
- data/spec/data/lwrp_override/providers/buck_passer.rb +5 -5
- data/spec/data/mac_users/10.7-8.plist.xml +559 -559
- data/spec/data/mac_users/10.7-8.shadow.xml +11 -11
- data/spec/data/mac_users/10.7.plist.xml +559 -559
- data/spec/data/mac_users/10.7.shadow.xml +11 -11
- data/spec/data/mac_users/10.8.plist.xml +559 -559
- data/spec/data/mac_users/10.8.shadow.xml +21 -21
- data/spec/data/mac_users/10.9.plist.xml +560 -560
- data/spec/data/mac_users/10.9.shadow.xml +21 -21
- data/spec/data/metadata/quick_start/metadata.rb +19 -19
- data/spec/data/nodes/default.rb +15 -15
- data/spec/data/nodes/test.example.com.rb +17 -17
- data/spec/data/nodes/test.rb +15 -15
- data/spec/data/null_config.rb +1 -1
- data/spec/data/object_loader/environments/test.json +7 -7
- data/spec/data/object_loader/environments/test.rb +2 -2
- data/spec/data/object_loader/environments/test_json_class.json +8 -8
- data/spec/data/object_loader/nodes/test.json +7 -7
- data/spec/data/object_loader/nodes/test.rb +2 -2
- data/spec/data/object_loader/nodes/test_json_class.json +8 -8
- data/spec/data/object_loader/roles/test.json +7 -7
- data/spec/data/object_loader/roles/test.rb +2 -2
- data/spec/data/object_loader/roles/test_json_class.json +8 -8
- data/spec/data/partial_one.erb +1 -1
- data/spec/data/recipes/test.rb +7 -7
- data/spec/data/run_context/cookbooks/circular-dep1/attributes/default.rb +4 -4
- data/spec/data/run_context/cookbooks/circular-dep1/definitions/circular_dep1_res.rb +1 -1
- data/spec/data/run_context/cookbooks/circular-dep1/libraries/lib.rb +2 -2
- data/spec/data/run_context/cookbooks/circular-dep1/metadata.rb +2 -2
- data/spec/data/run_context/cookbooks/circular-dep1/providers/provider.rb +1 -1
- data/spec/data/run_context/cookbooks/circular-dep1/resources/resource.rb +1 -1
- data/spec/data/run_context/cookbooks/circular-dep2/attributes/default.rb +3 -3
- data/spec/data/run_context/cookbooks/circular-dep2/definitions/circular_dep2_res.rb +1 -1
- data/spec/data/run_context/cookbooks/circular-dep2/libraries/lib.rb +2 -2
- data/spec/data/run_context/cookbooks/circular-dep2/metadata.rb +2 -2
- data/spec/data/run_context/cookbooks/circular-dep2/providers/provider.rb +1 -1
- data/spec/data/run_context/cookbooks/circular-dep2/resources/resource.rb +1 -1
- data/spec/data/run_context/cookbooks/dependency1/attributes/aa_first.rb +2 -2
- data/spec/data/run_context/cookbooks/dependency1/attributes/default.rb +2 -2
- data/spec/data/run_context/cookbooks/dependency1/attributes/zz_last.rb +3 -3
- data/spec/data/run_context/cookbooks/dependency1/definitions/dependency1_res.rb +1 -1
- data/spec/data/run_context/cookbooks/dependency1/libraries/lib.rb +2 -2
- data/spec/data/run_context/cookbooks/dependency1/providers/provider.rb +1 -1
- data/spec/data/run_context/cookbooks/dependency1/resources/resource.rb +1 -1
- data/spec/data/run_context/cookbooks/dependency2/attributes/default.rb +3 -3
- data/spec/data/run_context/cookbooks/dependency2/definitions/dependency2_res.rb +1 -1
- data/spec/data/run_context/cookbooks/dependency2/libraries/lib.rb +2 -2
- data/spec/data/run_context/cookbooks/dependency2/providers/provider.rb +1 -1
- data/spec/data/run_context/cookbooks/dependency2/resources/resource.rb +1 -1
- data/spec/data/run_context/cookbooks/no-default-attr/attributes/server.rb +3 -3
- data/spec/data/run_context/cookbooks/no-default-attr/definitions/no_default-attr_res.rb +1 -1
- data/spec/data/run_context/cookbooks/no-default-attr/providers/provider.rb +1 -1
- data/spec/data/run_context/cookbooks/no-default-attr/resources/resource.rb +1 -1
- data/spec/data/run_context/cookbooks/test-with-circular-deps/attributes/default.rb +3 -3
- data/spec/data/run_context/cookbooks/test-with-circular-deps/definitions/test_with-circular-deps_res.rb +1 -1
- data/spec/data/run_context/cookbooks/test-with-circular-deps/libraries/lib.rb +2 -2
- data/spec/data/run_context/cookbooks/test-with-circular-deps/metadata.rb +2 -2
- data/spec/data/run_context/cookbooks/test-with-circular-deps/providers/provider.rb +1 -1
- data/spec/data/run_context/cookbooks/test-with-circular-deps/resources/resource.rb +1 -1
- data/spec/data/run_context/cookbooks/test-with-deps/attributes/default.rb +3 -3
- data/spec/data/run_context/cookbooks/test-with-deps/definitions/test_with-deps_res.rb +1 -1
- data/spec/data/run_context/cookbooks/test-with-deps/libraries/lib.rb +1 -1
- data/spec/data/run_context/cookbooks/test-with-deps/metadata.rb +3 -3
- data/spec/data/run_context/cookbooks/test-with-deps/providers/provider.rb +1 -1
- data/spec/data/run_context/cookbooks/test-with-deps/resources/resource.rb +1 -1
- data/spec/data/run_context/cookbooks/test/attributes/george.rb +1 -1
- data/spec/data/run_context/cookbooks/test/definitions/new_animals.rb +9 -9
- data/spec/data/run_context/cookbooks/test/definitions/new_cat.rb +5 -5
- data/spec/data/run_context/cookbooks/test/definitions/test_res.rb +1 -1
- data/spec/data/run_context/cookbooks/test/providers/provider.rb +1 -1
- data/spec/data/run_context/cookbooks/test/recipes/default.rb +5 -5
- data/spec/data/run_context/cookbooks/test/recipes/one.rb +7 -7
- data/spec/data/run_context/cookbooks/test/recipes/two.rb +7 -7
- data/spec/data/run_context/cookbooks/test/resources/resource.rb +1 -1
- data/spec/data/run_context/nodes/run_context.rb +5 -5
- data/spec/data/search_queries_to_transform.txt +98 -98
- data/spec/data/shef-config.rb +10 -10
- data/spec/data/ssl/5e707473.0 +18 -18
- data/spec/data/ssl/chef-rspec.cert +27 -27
- data/spec/data/ssl/chef-rspec.key +27 -27
- data/spec/data/ssl/key.pem +15 -15
- data/spec/data/ssl/private_key.pem +27 -27
- data/spec/data/ssl/private_key_with_whitespace.pem +32 -32
- data/spec/data/standalone_cookbook/chefignore +9 -9
- data/spec/data/standalone_cookbook/recipes/default.rb +2 -2
- data/spec/data/trusted_certs/example.crt +22 -22
- data/spec/data/trusted_certs/intermediate.pem +27 -27
- data/spec/data/trusted_certs/root.pem +22 -22
- data/spec/functional/assets/chefinittest +34 -34
- data/spec/functional/assets/testchefsubsys +10 -10
- data/spec/functional/provider/remote_file/cache_control_data_spec.rb +0 -0
- data/spec/functional/resource/aix_service_spec.rb +0 -0
- data/spec/functional/resource/aixinit_service_spec.rb +0 -0
- data/spec/functional/resource/chocolatey_package_spec.rb +0 -5
- data/spec/functional/resource/env_spec.rb +0 -0
- data/spec/functional/win32/registry_spec.rb +1 -0
- data/spec/integration/client/exit_code_spec.rb +245 -0
- data/spec/integration/knife/deps_spec.rb +7 -7
- data/spec/integration/knife/download_spec.rb +19 -0
- data/spec/integration/knife/list_spec.rb +0 -8
- data/spec/integration/knife/upload_spec.rb +21 -2
- data/spec/integration/solo/solo_spec.rb +1 -1
- data/spec/rcov.opts +2 -2
- data/spec/unit/application/apply_spec.rb +6 -4
- data/spec/unit/application/exit_code_spec.rb +231 -0
- data/spec/unit/application/solo_spec.rb +143 -88
- data/spec/unit/chef_fs/config_spec.rb +129 -0
- data/spec/unit/chef_fs/file_system/repository/base_file_spec.rb +8 -10
- data/spec/unit/client_spec.rb +1 -1
- data/spec/unit/config_fetcher_spec.rb +2 -2
- data/spec/unit/cookbook/synchronizer_spec.rb +1 -1
- data/spec/unit/data_bag_item_spec.rb +2 -2
- data/spec/unit/data_bag_spec.rb +2 -2
- data/spec/unit/data_collector/messages/helpers_spec.rb +190 -0
- data/spec/unit/data_collector/messages_spec.rb +207 -0
- data/spec/unit/data_collector_spec.rb +525 -0
- data/spec/unit/decorator/lazy_array_spec.rb +58 -0
- data/spec/unit/decorator/lazy_spec.rb +39 -0
- data/spec/unit/decorator_spec.rb +142 -0
- data/spec/unit/environment_spec.rb +4 -4
- data/spec/unit/handler_spec.rb +87 -0
- data/spec/unit/knife/cookbook_show_spec.rb +89 -90
- data/spec/unit/knife/ssl_check_spec.rb +16 -0
- data/spec/unit/policy_builder/dynamic_spec.rb +1 -1
- data/spec/unit/policy_builder/policyfile_spec.rb +1 -1
- data/spec/unit/provider/git_spec.rb +77 -18
- data/spec/unit/provider/package/apt_spec.rb +97 -34
- data/spec/unit/provider/package/chocolatey_spec.rb +3 -15
- data/spec/unit/provider/package/portage_spec.rb +6 -0
- data/spec/unit/provider/package/rubygems_spec.rb +38 -4
- data/spec/unit/provider/package/yum/yum_cache_spec.rb +27 -0
- data/spec/unit/provider/package_spec.rb +20 -7
- data/spec/unit/provider/systemd_unit_spec.rb +885 -0
- data/spec/unit/resource/systemd_unit_spec.rb +133 -0
- data/spec/unit/resource_builder_spec.rb +1 -1
- data/tasks/bin/bundle-platform +6 -2
- data/tasks/bin/bundle-platform.bat +0 -0
- data/tasks/bin/create-override-gemfile +0 -0
- data/tasks/bin/run_external_test +0 -0
- data/tasks/bundle_util.rb +18 -2
- data/tasks/changelog.rb +1 -0
- data/tasks/dependencies.rb +47 -57
- metadata +847 -7
- data/tasks/bin/run_chef_tests +0 -17
@@ -0,0 +1,125 @@
|
|
1
|
+
#
|
2
|
+
# Author:: Adam Leff (<adamleff@chef.io)
|
3
|
+
# Author:: Ryan Cragun (<ryan@chef.io>)
|
4
|
+
#
|
5
|
+
# Copyright:: Copyright 2012-2016, Chef Software Inc.
|
6
|
+
# License:: Apache License, Version 2.0
|
7
|
+
#
|
8
|
+
# Licensed under the Apache License, Version 2.0 (the "License");
|
9
|
+
# you may not use this file except in compliance with the License.
|
10
|
+
# You may obtain a copy of the License at
|
11
|
+
#
|
12
|
+
# http://www.apache.org/licenses/LICENSE-2.0
|
13
|
+
#
|
14
|
+
# Unless required by applicable law or agreed to in writing, software
|
15
|
+
# distributed under the License is distributed on an "AS IS" BASIS,
|
16
|
+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
17
|
+
# See the License for the specific language governing permissions and
|
18
|
+
# limitations under the License.
|
19
|
+
#
|
20
|
+
|
21
|
+
require "json"
|
22
|
+
require "securerandom"
|
23
|
+
require_relative "messages/helpers"
|
24
|
+
|
25
|
+
class Chef
|
26
|
+
class DataCollector
|
27
|
+
module Messages
|
28
|
+
extend Helpers
|
29
|
+
|
30
|
+
#
|
31
|
+
# Message payload that is sent to the DataCollector server at the
|
32
|
+
# start of a Chef run.
|
33
|
+
#
|
34
|
+
# @param run_status [Chef::RunStatus] The RunStatus instance for this node/run.
|
35
|
+
#
|
36
|
+
# @return [Hash] A hash containing the run start message data.
|
37
|
+
#
|
38
|
+
def self.run_start_message(run_status)
|
39
|
+
{
|
40
|
+
"chef_server_fqdn" => chef_server_fqdn(run_status),
|
41
|
+
"entity_uuid" => node_uuid,
|
42
|
+
"id" => run_status.run_id,
|
43
|
+
"message_version" => "1.0.0",
|
44
|
+
"message_type" => "run_start",
|
45
|
+
"node_name" => run_status.node.name,
|
46
|
+
"organization_name" => organization,
|
47
|
+
"run_id" => run_status.run_id,
|
48
|
+
"source" => collector_source,
|
49
|
+
"start_time" => run_status.start_time.utc.iso8601,
|
50
|
+
}
|
51
|
+
end
|
52
|
+
|
53
|
+
#
|
54
|
+
# Message payload that is sent to the DataCollector server at the
|
55
|
+
# end of a Chef run.
|
56
|
+
#
|
57
|
+
# @param reporter_data [Hash] Data supplied by the Reporter, such as run_status, resource counts, etc.
|
58
|
+
#
|
59
|
+
# @return [Hash] A hash containing the run end message data.
|
60
|
+
#
|
61
|
+
def self.run_end_message(reporter_data)
|
62
|
+
run_status = reporter_data[:run_status]
|
63
|
+
|
64
|
+
message = {
|
65
|
+
"chef_server_fqdn" => chef_server_fqdn(run_status),
|
66
|
+
"entity_uuid" => node_uuid,
|
67
|
+
"expanded_run_list" => reporter_data[:expanded_run_list],
|
68
|
+
"id" => run_status.run_id,
|
69
|
+
"message_version" => "1.0.0",
|
70
|
+
"message_type" => "run_converge",
|
71
|
+
"node_name" => run_status.node.name,
|
72
|
+
"organization_name" => organization,
|
73
|
+
"resources" => reporter_data[:updated_resources].map(&:for_json),
|
74
|
+
"run_id" => run_status.run_id,
|
75
|
+
"run_list" => run_status.node.run_list.for_json,
|
76
|
+
"start_time" => run_status.start_time.utc.iso8601,
|
77
|
+
"end_time" => run_status.end_time.utc.iso8601,
|
78
|
+
"source" => collector_source,
|
79
|
+
"status" => reporter_data[:status],
|
80
|
+
"total_resource_count" => reporter_data[:total_resource_count],
|
81
|
+
"updated_resource_count" => reporter_data[:updated_resources].count,
|
82
|
+
}
|
83
|
+
|
84
|
+
message["error"] = {
|
85
|
+
"class" => run_status.exception.class,
|
86
|
+
"message" => run_status.exception.message,
|
87
|
+
"backtrace" => run_status.exception.backtrace,
|
88
|
+
"description" => reporter_data[:error_descriptions],
|
89
|
+
} if run_status.exception
|
90
|
+
|
91
|
+
message
|
92
|
+
end
|
93
|
+
|
94
|
+
#
|
95
|
+
# Message payload that is sent to the DataCollector server at the
|
96
|
+
# end of a Chef run.
|
97
|
+
#
|
98
|
+
# @param run_status [Chef::RunStatus] The RunStatus instance for this node/run.
|
99
|
+
#
|
100
|
+
# @return [Hash] A hash containing the node object and related metadata.
|
101
|
+
#
|
102
|
+
def self.node_update_message(run_status)
|
103
|
+
{
|
104
|
+
"entity_name" => run_status.node.name,
|
105
|
+
"entity_type" => "node",
|
106
|
+
"entity_uuid" => node_uuid,
|
107
|
+
"id" => SecureRandom.uuid,
|
108
|
+
"message_version" => "1.1.0",
|
109
|
+
"message_type" => "action",
|
110
|
+
"organization_name" => organization,
|
111
|
+
"recorded_at" => Time.now.utc.iso8601,
|
112
|
+
"remote_hostname" => run_status.node["fqdn"],
|
113
|
+
"requestor_name" => run_status.node.name,
|
114
|
+
"requestor_type" => "client",
|
115
|
+
"run_id" => run_status.run_id,
|
116
|
+
"service_hostname" => chef_server_fqdn(run_status),
|
117
|
+
"source" => collector_source,
|
118
|
+
"task" => "update",
|
119
|
+
"user_agent" => Chef::HTTP::HTTPRequest::DEFAULT_UA,
|
120
|
+
"data" => run_status.node,
|
121
|
+
}
|
122
|
+
end
|
123
|
+
end
|
124
|
+
end
|
125
|
+
end
|
@@ -0,0 +1,161 @@
|
|
1
|
+
#
|
2
|
+
# Author:: Adam Leff (<adamleff@chef.io)
|
3
|
+
# Author:: Ryan Cragun (<ryan@chef.io>)
|
4
|
+
#
|
5
|
+
# Copyright:: Copyright 2012-2016, Chef Software Inc.
|
6
|
+
# License:: Apache License, Version 2.0
|
7
|
+
#
|
8
|
+
# Licensed under the Apache License, Version 2.0 (the "License");
|
9
|
+
# you may not use this file except in compliance with the License.
|
10
|
+
# You may obtain a copy of the License at
|
11
|
+
#
|
12
|
+
# http://www.apache.org/licenses/LICENSE-2.0
|
13
|
+
#
|
14
|
+
# Unless required by applicable law or agreed to in writing, software
|
15
|
+
# distributed under the License is distributed on an "AS IS" BASIS,
|
16
|
+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
17
|
+
# See the License for the specific language governing permissions and
|
18
|
+
# limitations under the License.
|
19
|
+
#
|
20
|
+
|
21
|
+
class Chef
|
22
|
+
class DataCollector
|
23
|
+
module Messages
|
24
|
+
module Helpers
|
25
|
+
#
|
26
|
+
# Fully-qualified domain name of the Chef Server configured in Chef::Config
|
27
|
+
# If the chef_server_url cannot be parsed as a URI, the node["fqdn"] attribute
|
28
|
+
# will be returned, or "localhost" if the run_status is unavailable to us.
|
29
|
+
#
|
30
|
+
# @param run_status [Chef::RunStatus] The RunStatus object for this Chef Run.
|
31
|
+
#
|
32
|
+
# @return [String] FQDN of the configured Chef Server, or node/localhost if not found.
|
33
|
+
#
|
34
|
+
def chef_server_fqdn(run_status)
|
35
|
+
if !Chef::Config[:chef_server_url].nil?
|
36
|
+
URI(Chef::Config[:chef_server_url]).host
|
37
|
+
elsif !Chef::Config[:node_name].nil?
|
38
|
+
Chef::Config[:node_name]
|
39
|
+
else
|
40
|
+
"localhost"
|
41
|
+
end
|
42
|
+
end
|
43
|
+
|
44
|
+
#
|
45
|
+
# The organization name the node is associated with. For Chef Solo runs, a
|
46
|
+
# user-configured organization string is returned, or the string "chef_solo"
|
47
|
+
# if such a string is not configured.
|
48
|
+
#
|
49
|
+
# @return [String] Organization to which the node is associated
|
50
|
+
#
|
51
|
+
def organization
|
52
|
+
solo_run? ? data_collector_organization : chef_server_organization
|
53
|
+
end
|
54
|
+
|
55
|
+
#
|
56
|
+
# Returns the user-configured organization, or "chef_solo" if none is configured.
|
57
|
+
#
|
58
|
+
# This is only used when Chef is run in Solo mode.
|
59
|
+
#
|
60
|
+
# @return [String] Data-collector-specific organization used when running in Chef Solo
|
61
|
+
#
|
62
|
+
def data_collector_organization
|
63
|
+
Chef::Config[:data_collector][:organization] || "chef_solo"
|
64
|
+
end
|
65
|
+
|
66
|
+
#
|
67
|
+
# Return the organization assumed by the configured chef_server_url.
|
68
|
+
#
|
69
|
+
# We must parse this from the Chef::Config[:chef_server_url] because a node
|
70
|
+
# has no knowledge of an organization or to which organization is belongs.
|
71
|
+
#
|
72
|
+
# If we cannot determine the organization, we return "unknown_organization"
|
73
|
+
#
|
74
|
+
# @return [String] shortname of the Chef Server organization
|
75
|
+
#
|
76
|
+
def chef_server_organization
|
77
|
+
return "unknown_organization" unless Chef::Config[:chef_server_url]
|
78
|
+
|
79
|
+
Chef::Config[:chef_server_url].match(%r{/+organizations/+(\w+)}).nil? ? "unknown_organization" : $1
|
80
|
+
end
|
81
|
+
|
82
|
+
#
|
83
|
+
# The source of the data collecting during this run, used by the
|
84
|
+
# DataCollector endpoint to determine if Chef was in Solo mode or not.
|
85
|
+
#
|
86
|
+
# @return [String] "chef_solo" if in Solo mode, "chef_client" if in Client mode
|
87
|
+
#
|
88
|
+
def collector_source
|
89
|
+
solo_run? ? "chef_solo" : "chef_client"
|
90
|
+
end
|
91
|
+
|
92
|
+
#
|
93
|
+
# If we're running in Solo (legacy) mode, or in Solo (formerly
|
94
|
+
# "Chef Client Local Mode"), we're considered to be in a "solo run".
|
95
|
+
#
|
96
|
+
# @return [Boolean] Whether we're in a solo run or not
|
97
|
+
#
|
98
|
+
def solo_run?
|
99
|
+
Chef::Config[:solo] || Chef::Config[:local_mode]
|
100
|
+
end
|
101
|
+
|
102
|
+
#
|
103
|
+
# Returns a UUID that uniquely identifies this node for reporting reasons.
|
104
|
+
#
|
105
|
+
# The node is read in from disk if it exists, or it's generated if it does
|
106
|
+
# does not exist.
|
107
|
+
#
|
108
|
+
# @return [String] UUID for the node
|
109
|
+
#
|
110
|
+
def node_uuid
|
111
|
+
read_node_uuid || generate_node_uuid
|
112
|
+
end
|
113
|
+
|
114
|
+
#
|
115
|
+
# Generates a UUID for the node via SecureRandom.uuid and writes out
|
116
|
+
# metadata file so the UUID persists between runs.
|
117
|
+
#
|
118
|
+
# @return [String] UUID for the node
|
119
|
+
#
|
120
|
+
def generate_node_uuid
|
121
|
+
uuid = SecureRandom.uuid
|
122
|
+
update_metadata("node_uuid", uuid)
|
123
|
+
|
124
|
+
uuid
|
125
|
+
end
|
126
|
+
|
127
|
+
#
|
128
|
+
# Reads in the node UUID from the node metadata file
|
129
|
+
#
|
130
|
+
# @return [String] UUID for the node
|
131
|
+
#
|
132
|
+
def read_node_uuid
|
133
|
+
metadata["node_uuid"]
|
134
|
+
end
|
135
|
+
|
136
|
+
#
|
137
|
+
# Returns the DataCollector metadata for this node
|
138
|
+
#
|
139
|
+
# If the metadata file does not exist in the file cache path,
|
140
|
+
# an empty hash will be returned.
|
141
|
+
#
|
142
|
+
# @return [Hash] DataCollector metadata for this node
|
143
|
+
#
|
144
|
+
def metadata
|
145
|
+
JSON.load(Chef::FileCache.load(metadata_filename))
|
146
|
+
rescue Chef::Exceptions::FileNotFound
|
147
|
+
{}
|
148
|
+
end
|
149
|
+
|
150
|
+
def update_metadata(key, value)
|
151
|
+
metadata[key] = value
|
152
|
+
Chef::FileCache.store(metadata_filename, metadata.to_json, 0644)
|
153
|
+
end
|
154
|
+
|
155
|
+
def metadata_filename
|
156
|
+
"data_collector_metadata.json"
|
157
|
+
end
|
158
|
+
end
|
159
|
+
end
|
160
|
+
end
|
161
|
+
end
|
@@ -0,0 +1,84 @@
|
|
1
|
+
#
|
2
|
+
# Author:: Adam Leff (<adamleff@chef.io>)
|
3
|
+
# Author:: Ryan Cragun (<ryan@chef.io>)
|
4
|
+
#
|
5
|
+
# Copyright:: Copyright 2012-2016, Chef Software Inc.
|
6
|
+
# License:: Apache License, Version 2.0
|
7
|
+
#
|
8
|
+
# Licensed under the Apache License, Version 2.0 (the "License");
|
9
|
+
# you may not use this file except in compliance with the License.
|
10
|
+
# You may obtain a copy of the License at
|
11
|
+
#
|
12
|
+
# http://www.apache.org/licenses/LICENSE-2.0
|
13
|
+
#
|
14
|
+
# Unless required by applicable law or agreed to in writing, software
|
15
|
+
# distributed under the License is distributed on an "AS IS" BASIS,
|
16
|
+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
17
|
+
# See the License for the specific language governing permissions and
|
18
|
+
# limitations under the License.
|
19
|
+
#
|
20
|
+
|
21
|
+
class Chef
|
22
|
+
class DataCollector
|
23
|
+
class ResourceReport
|
24
|
+
|
25
|
+
attr_reader :action, :current_resource, :elapsed_time, :new_resource, :status
|
26
|
+
attr_accessor :conditional, :exception
|
27
|
+
|
28
|
+
def initialize(new_resource, action, current_resource = nil)
|
29
|
+
@new_resource = new_resource
|
30
|
+
@action = action
|
31
|
+
@current_resource = current_resource
|
32
|
+
end
|
33
|
+
|
34
|
+
def skipped(conditional)
|
35
|
+
@status = "skipped"
|
36
|
+
@conditional = conditional
|
37
|
+
end
|
38
|
+
|
39
|
+
def updated
|
40
|
+
@status = "updated"
|
41
|
+
end
|
42
|
+
|
43
|
+
def failed(exception)
|
44
|
+
@current_resource = nil
|
45
|
+
@status = "failed"
|
46
|
+
@exception = exception
|
47
|
+
end
|
48
|
+
|
49
|
+
def up_to_date
|
50
|
+
@status = "up-to-date"
|
51
|
+
end
|
52
|
+
|
53
|
+
def finish
|
54
|
+
@elapsed_time = new_resource.elapsed_time
|
55
|
+
end
|
56
|
+
|
57
|
+
def to_hash
|
58
|
+
hash = {
|
59
|
+
"type" => new_resource.resource_name.to_sym,
|
60
|
+
"name" => new_resource.name.to_s,
|
61
|
+
"id" => new_resource.identity.to_s,
|
62
|
+
"after" => new_resource.state_for_resource_reporter,
|
63
|
+
"before" => current_resource ? current_resource.state_for_resource_reporter : {},
|
64
|
+
"duration" => (elapsed_time * 1000).to_i.to_s,
|
65
|
+
"delta" => new_resource.respond_to?(:diff) ? new_resource.diff : "",
|
66
|
+
"result" => action.to_s,
|
67
|
+
"status" => status,
|
68
|
+
}
|
69
|
+
|
70
|
+
if new_resource.cookbook_name
|
71
|
+
hash["cookbook_name"] = new_resource.cookbook_name
|
72
|
+
hash["cookbook_version"] = new_resource.cookbook_version.version
|
73
|
+
end
|
74
|
+
|
75
|
+
hash["conditional"] = conditional.to_text if status == "skipped"
|
76
|
+
hash["error_message"] = exception.message unless exception.nil?
|
77
|
+
|
78
|
+
hash
|
79
|
+
end
|
80
|
+
alias :to_h :to_hash
|
81
|
+
alias :for_json :to_hash
|
82
|
+
end
|
83
|
+
end
|
84
|
+
end
|
@@ -0,0 +1,81 @@
|
|
1
|
+
#--
|
2
|
+
# Copyright:: Copyright 2016 Chef Software, Inc.
|
3
|
+
# License:: Apache License, Version 2.0
|
4
|
+
#
|
5
|
+
# Licensed under the Apache License, Version 2.0 (the "License");
|
6
|
+
# you may not use this file except in compliance with the License.
|
7
|
+
# You may obtain a copy of the License at
|
8
|
+
#
|
9
|
+
# http://www.apache.org/licenses/LICENSE-2.0
|
10
|
+
#
|
11
|
+
# Unless required by applicable law or agreed to in writing, software
|
12
|
+
# distributed under the License is distributed on an "AS IS" BASIS,
|
13
|
+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
14
|
+
# See the License for the specific language governing permissions and
|
15
|
+
# limitations under the License.
|
16
|
+
#
|
17
|
+
|
18
|
+
require "delegate"
|
19
|
+
|
20
|
+
class Chef
|
21
|
+
class Decorator < SimpleDelegator
|
22
|
+
NULL = ::Object.new
|
23
|
+
|
24
|
+
def initialize(obj = NULL)
|
25
|
+
@__defined_methods__ = []
|
26
|
+
super unless obj.equal?(NULL)
|
27
|
+
end
|
28
|
+
|
29
|
+
# if we wrap a nil then decorator.nil? should be true
|
30
|
+
def nil?
|
31
|
+
__getobj__.nil?
|
32
|
+
end
|
33
|
+
|
34
|
+
# if we wrap a Hash then decorator.is_a?(Hash) should be true
|
35
|
+
def is_a?(klass)
|
36
|
+
__getobj__.is_a?(klass) || super
|
37
|
+
end
|
38
|
+
|
39
|
+
# if we wrap a Hash then decorator.kind_of?(Hash) should be true
|
40
|
+
def kind_of?(klass)
|
41
|
+
__getobj__.kind_of?(klass) || super
|
42
|
+
end
|
43
|
+
|
44
|
+
# reset our methods on the instance if the object changes under us (this also
|
45
|
+
# clears out the closure over the target we create in method_missing below)
|
46
|
+
def __setobj__(obj)
|
47
|
+
__reset_methods__
|
48
|
+
super
|
49
|
+
end
|
50
|
+
|
51
|
+
# this is the ruby 2.2/2.3 implementation of Delegator#method_missing() with
|
52
|
+
# adding the define_singleton_method call and @__defined_methods__ tracking
|
53
|
+
def method_missing(m, *args, &block)
|
54
|
+
r = true
|
55
|
+
target = self.__getobj__ { r = false }
|
56
|
+
|
57
|
+
if r && target.respond_to?(m)
|
58
|
+
# these next 4 lines are the patched code
|
59
|
+
define_singleton_method(m) do |*args, &block|
|
60
|
+
target.__send__(m, *args, &block)
|
61
|
+
end
|
62
|
+
@__defined_methods__.push(m)
|
63
|
+
target.__send__(m, *args, &block)
|
64
|
+
elsif ::Kernel.respond_to?(m, true)
|
65
|
+
::Kernel.instance_method(m).bind(self).call(*args, &block)
|
66
|
+
else
|
67
|
+
super(m, *args, &block)
|
68
|
+
end
|
69
|
+
end
|
70
|
+
|
71
|
+
private
|
72
|
+
|
73
|
+
# used by __setobj__ to clear the methods we've built on the instance.
|
74
|
+
def __reset_methods__
|
75
|
+
@__defined_methods__.each do |m|
|
76
|
+
singleton_class.send(:undef_method, m)
|
77
|
+
end
|
78
|
+
@__defined_methods__ = []
|
79
|
+
end
|
80
|
+
end
|
81
|
+
end
|