chef 11.4.4 → 11.6.0.hotfix.1
Sign up to get free protection for your applications and to get access to all the features.
- data/README.md +1 -1
- data/Rakefile +18 -1
- data/bin/chef-service-manager +37 -0
- data/distro/common/html/chef-client.8.html +4 -4
- data/distro/common/html/chef-expander.8.html +4 -4
- data/distro/common/html/chef-expanderctl.8.html +4 -4
- data/distro/common/html/chef-server-webui.8.html +4 -4
- data/distro/common/html/chef-server.8.html +4 -4
- data/distro/common/html/chef-shell.1.html +4 -4
- data/distro/common/html/chef-solo.8.html +12 -18
- data/distro/common/html/chef-solr.8.html +4 -4
- data/distro/common/html/knife-bootstrap.1.html +4 -4
- data/distro/common/html/knife-client.1.html +4 -4
- data/distro/common/html/knife-configure.1.html +4 -4
- data/distro/common/html/knife-cookbook-site.1.html +4 -4
- data/distro/common/html/knife-cookbook.1.html +7 -10
- data/distro/common/html/knife-data-bag.1.html +7 -10
- data/distro/common/html/knife-environment.1.html +6 -8
- data/distro/common/html/knife-exec.1.html +4 -4
- data/distro/common/html/knife-index.1.html +4 -4
- data/distro/common/html/knife-node.1.html +4 -4
- data/distro/common/html/knife-role.1.html +4 -4
- data/distro/common/html/knife-search.1.html +4 -4
- data/distro/common/html/knife-ssh.1.html +4 -4
- data/distro/common/html/knife-status.1.html +4 -4
- data/distro/common/html/knife-tag.1.html +4 -4
- data/distro/common/html/knife.1.html +4 -4
- data/distro/common/man/man1/chef-shell.1 +1 -1
- data/distro/common/man/man1/knife-bootstrap.1 +1 -1
- data/distro/common/man/man1/knife-client.1 +1 -1
- data/distro/common/man/man1/knife-configure.1 +1 -1
- data/distro/common/man/man1/knife-cookbook-site.1 +1 -1
- data/distro/common/man/man1/knife-cookbook.1 +2 -15
- data/distro/common/man/man1/knife-data-bag.1 +2 -15
- data/distro/common/man/man1/knife-environment.1 +2 -12
- data/distro/common/man/man1/knife-exec.1 +1 -1
- data/distro/common/man/man1/knife-index.1 +1 -1
- data/distro/common/man/man1/knife-node.1 +1 -1
- data/distro/common/man/man1/knife-role.1 +1 -1
- data/distro/common/man/man1/knife-search.1 +1 -1
- data/distro/common/man/man1/knife-ssh.1 +1 -1
- data/distro/common/man/man1/knife-status.1 +1 -1
- data/distro/common/man/man1/knife-tag.1 +1 -1
- data/distro/common/man/man1/knife.1 +1 -1
- data/distro/common/man/man8/chef-client.8 +1 -1
- data/distro/common/man/man8/chef-expander.8 +1 -1
- data/distro/common/man/man8/chef-expanderctl.8 +1 -1
- data/distro/common/man/man8/chef-server-webui.8 +1 -1
- data/distro/common/man/man8/chef-server.8 +1 -1
- data/distro/common/man/man8/chef-solo.8 +4 -36
- data/distro/common/man/man8/chef-solr.8 +1 -1
- data/distro/debian/etc/init.d/chef-client +4 -2
- data/distro/windows/service_manager.rb +2 -146
- data/lib/chef.rb +1 -1
- data/lib/chef/application.rb +5 -12
- data/lib/chef/application/apply.rb +2 -0
- data/lib/chef/application/client.rb +12 -12
- data/lib/chef/application/knife.rb +2 -2
- data/lib/chef/application/solo.rb +4 -5
- data/lib/chef/application/windows_service.rb +113 -56
- data/lib/chef/application/windows_service_manager.rb +179 -0
- data/lib/chef/chef_fs.rb +2 -4
- data/lib/chef/chef_fs/chef_fs_data_store.rb +371 -0
- data/lib/chef/chef_fs/command_line.rb +145 -93
- data/lib/chef/chef_fs/config.rb +205 -0
- data/lib/chef/chef_fs/data_handler/acl_data_handler.rb +26 -0
- data/lib/chef/chef_fs/data_handler/client_data_handler.rb +38 -0
- data/lib/chef/chef_fs/data_handler/container_data_handler.rb +29 -0
- data/lib/chef/chef_fs/data_handler/cookbook_data_handler.rb +38 -0
- data/lib/chef/chef_fs/data_handler/data_bag_item_data_handler.rb +56 -0
- data/lib/chef/chef_fs/data_handler/data_handler_base.rb +128 -0
- data/lib/chef/chef_fs/data_handler/environment_data_handler.rb +40 -0
- data/lib/chef/chef_fs/data_handler/group_data_handler.rb +51 -0
- data/lib/chef/chef_fs/data_handler/node_data_handler.rb +36 -0
- data/lib/chef/chef_fs/data_handler/role_data_handler.rb +40 -0
- data/lib/chef/chef_fs/data_handler/user_data_handler.rb +27 -0
- data/lib/chef/chef_fs/file_system.rb +195 -127
- data/lib/chef/chef_fs/file_system/acl_dir.rb +64 -0
- data/lib/chef/chef_fs/file_system/acl_entry.rb +58 -0
- data/lib/chef/chef_fs/file_system/acls_dir.rb +68 -0
- data/lib/chef/chef_fs/file_system/already_exists_error.rb +31 -0
- data/lib/chef/chef_fs/file_system/base_fs_object.rb +98 -39
- data/lib/chef/chef_fs/file_system/chef_repository_file_system_cookbook_dir.rb +85 -0
- data/lib/chef/chef_fs/file_system/chef_repository_file_system_cookbook_entry.rb +71 -0
- data/lib/chef/chef_fs/file_system/chef_repository_file_system_cookbooks_dir.rb +55 -0
- data/lib/chef/chef_fs/file_system/chef_repository_file_system_data_bags_dir.rb +36 -0
- data/lib/chef/chef_fs/file_system/chef_repository_file_system_entry.rb +14 -63
- data/lib/chef/chef_fs/file_system/chef_repository_file_system_root_dir.rb +93 -3
- data/lib/chef/chef_fs/file_system/chef_server_root_dir.rb +35 -9
- data/lib/chef/chef_fs/file_system/cookbook_dir.rb +67 -32
- data/lib/chef/chef_fs/file_system/cookbook_file.rb +13 -6
- data/lib/chef/chef_fs/file_system/cookbook_frozen_error.rb +31 -0
- data/lib/chef/chef_fs/file_system/cookbooks_acl_dir.rb +41 -0
- data/lib/chef/chef_fs/file_system/cookbooks_dir.rb +102 -21
- data/lib/chef/chef_fs/file_system/data_bag_dir.rb +12 -21
- data/lib/chef/chef_fs/file_system/data_bags_dir.rb +14 -8
- data/lib/chef/chef_fs/file_system/default_environment_cannot_be_modified_error.rb +36 -0
- data/lib/chef/chef_fs/file_system/environments_dir.rb +60 -0
- data/lib/chef/chef_fs/file_system/file_system_entry.rb +8 -8
- data/lib/chef/chef_fs/file_system/file_system_error.rb +3 -1
- data/lib/chef/chef_fs/file_system/memory_dir.rb +52 -0
- data/lib/chef/chef_fs/file_system/memory_file.rb +17 -0
- data/lib/chef/chef_fs/file_system/memory_root.rb +21 -0
- data/lib/chef/chef_fs/file_system/multiplexed_dir.rb +48 -0
- data/lib/chef/chef_fs/file_system/must_delete_recursively_error.rb +2 -2
- data/lib/chef/chef_fs/file_system/nodes_dir.rb +17 -9
- data/lib/chef/chef_fs/file_system/nonexistent_fs_object.rb +0 -4
- data/lib/chef/chef_fs/file_system/not_found_error.rb +2 -2
- data/lib/chef/chef_fs/file_system/operation_failed_error.rb +34 -0
- data/lib/chef/chef_fs/file_system/operation_not_allowed_error.rb +48 -0
- data/lib/chef/chef_fs/file_system/rest_list_dir.rb +42 -13
- data/lib/chef/chef_fs/file_system/rest_list_entry.rb +81 -27
- data/lib/chef/chef_fs/knife.rb +68 -29
- data/lib/chef/chef_fs/parallelizer.rb +129 -0
- data/lib/chef/chef_fs/path_utils.rb +29 -3
- data/lib/chef/chef_fs/raw_request.rb +79 -0
- data/lib/chef/client.rb +46 -20
- data/lib/chef/config.rb +59 -61
- data/lib/chef/cookbook/chefignore.rb +2 -1
- data/lib/chef/cookbook/synchronizer.rb +8 -6
- data/lib/chef/cookbook/syntax_check.rb +17 -2
- data/lib/chef/cookbook_uploader.rb +10 -1
- data/lib/chef/cookbook_version.rb +0 -109
- data/lib/chef/data_bag.rb +15 -6
- data/lib/chef/deprecation/mixin/template.rb +49 -0
- data/lib/chef/deprecation/provider/cookbook_file.rb +55 -0
- data/lib/chef/deprecation/provider/file.rb +197 -0
- data/lib/chef/deprecation/provider/remote_file.rb +86 -0
- data/lib/chef/deprecation/provider/template.rb +63 -0
- data/lib/chef/deprecation/warnings.rb +38 -0
- data/lib/chef/encrypted_data_bag_item.rb +153 -61
- data/lib/chef/environment.rb +34 -3
- data/lib/chef/event_dispatch/base.rb +3 -0
- data/lib/chef/exceptions.rb +27 -2
- data/lib/chef/file_access_control/unix.rb +64 -7
- data/lib/chef/file_access_control/windows.rb +22 -11
- data/lib/chef/file_content_management/content_base.rb +56 -0
- data/lib/chef/file_content_management/deploy.rb +38 -0
- data/lib/chef/file_content_management/deploy/cp.rb +48 -0
- data/lib/chef/file_content_management/deploy/mv_unix.rb +77 -0
- data/lib/chef/file_content_management/deploy/mv_windows.rb +95 -0
- data/lib/chef/file_content_management/tempfile.rb +61 -0
- data/lib/chef/formatters/doc.rb +1 -1
- data/lib/chef/formatters/error_descriptor.rb +5 -4
- data/lib/chef/formatters/error_inspectors/cookbook_resolve_error_inspector.rb +23 -3
- data/lib/chef/formatters/error_inspectors/registration_error_inspector.rb +4 -0
- data/lib/chef/json_compat.rb +3 -0
- data/lib/chef/knife.rb +12 -3
- data/lib/chef/knife/bootstrap.rb +46 -2
- data/lib/chef/knife/bootstrap/archlinux-gems.erb +3 -3
- data/lib/chef/knife/bootstrap/centos5-gems.erb +3 -3
- data/lib/chef/knife/bootstrap/chef-full.erb +4 -4
- data/lib/chef/knife/bootstrap/fedora13-gems.erb +3 -3
- data/lib/chef/knife/bootstrap/ubuntu10.04-apt.erb +3 -3
- data/lib/chef/knife/bootstrap/ubuntu10.04-gems.erb +3 -3
- data/lib/chef/knife/bootstrap/ubuntu12.04-gems.erb +3 -3
- data/lib/chef/knife/client_show.rb +2 -5
- data/lib/chef/knife/configure.rb +3 -3
- data/lib/chef/knife/cookbook_create.rb +6 -5
- data/lib/chef/knife/cookbook_download.rb +13 -5
- data/lib/chef/knife/cookbook_site_share.rb +1 -0
- data/lib/chef/knife/cookbook_test.rb +1 -0
- data/lib/chef/knife/cookbook_upload.rb +4 -9
- data/lib/chef/knife/core/bootstrap_context.rb +10 -4
- data/lib/chef/knife/core/generic_presenter.rb +16 -0
- data/lib/chef/knife/core/node_editor.rb +1 -1
- data/lib/chef/knife/core/subcommand_loader.rb +43 -12
- data/lib/chef/knife/core/ui.rb +19 -4
- data/lib/chef/knife/delete.rb +76 -9
- data/lib/chef/knife/deps.rb +139 -0
- data/lib/chef/knife/diff.rb +22 -5
- data/lib/chef/knife/download.rb +16 -3
- data/lib/chef/knife/edit.rb +76 -0
- data/lib/chef/knife/environment_show.rb +2 -7
- data/lib/chef/knife/list.rb +91 -47
- data/lib/chef/knife/node_run_list_set.rb +66 -0
- data/lib/chef/knife/node_show.rb +1 -7
- data/lib/chef/knife/raw.rb +20 -64
- data/lib/chef/knife/role_show.rb +2 -4
- data/lib/chef/knife/search.rb +5 -6
- data/lib/chef/knife/show.rb +34 -11
- data/lib/chef/knife/ssh.rb +8 -0
- data/lib/chef/knife/upload.rb +23 -4
- data/lib/chef/knife/user_show.rb +2 -5
- data/lib/chef/knife/xargs.rb +265 -0
- data/lib/chef/log.rb +2 -2
- data/lib/chef/mixin/file_class.rb +0 -9
- data/lib/chef/mixin/language_include_recipe.rb +1 -1
- data/lib/chef/mixin/params_validate.rb +19 -9
- data/lib/chef/mixin/template.rb +126 -36
- data/lib/chef/mixin/windows_architecture_helper.rb +91 -0
- data/lib/chef/monkey_patches/file.rb +26 -0
- data/lib/chef/monkey_patches/net-ssh-multi.rb +140 -0
- data/lib/chef/monkey_patches/securerandom.rb +44 -0
- data/lib/chef/monologger.rb +93 -0
- data/lib/chef/node.rb +4 -0
- data/lib/chef/platform.rb +4 -490
- data/lib/chef/platform/provider_mapping.rb +529 -0
- data/lib/chef/{monkey_patches/dir.rb → platform/query_helpers.rb} +25 -19
- data/lib/chef/provider.rb +12 -9
- data/lib/chef/provider/batch.rb +35 -0
- data/lib/chef/provider/cookbook_file.rb +9 -78
- data/lib/chef/provider/cookbook_file/content.rb +49 -0
- data/lib/chef/provider/deploy.rb +24 -20
- data/lib/chef/provider/deploy/revision.rb +27 -0
- data/lib/chef/provider/directory.rb +19 -22
- data/lib/chef/provider/execute.rb +22 -5
- data/lib/chef/provider/file.rb +299 -217
- data/lib/chef/provider/file/content.rb +39 -0
- data/lib/chef/provider/git.rb +76 -43
- data/lib/chef/provider/group/usermod.rb +2 -2
- data/lib/chef/provider/ifconfig.rb +25 -35
- data/lib/chef/provider/ifconfig/debian.rb +71 -0
- data/lib/chef/provider/ifconfig/redhat.rb +47 -0
- data/lib/chef/provider/link.rb +10 -3
- data/lib/chef/provider/mount.rb +1 -1
- data/lib/chef/provider/mount/mount.rb +8 -3
- data/lib/chef/provider/mount/windows.rb +4 -1
- data/lib/chef/provider/package/portage.rb +9 -4
- data/lib/chef/provider/package/rubygems.rb +45 -10
- data/lib/chef/provider/package/smartos.rb +47 -36
- data/lib/chef/provider/package/yum.rb +19 -12
- data/lib/chef/provider/package/zypper.rb +45 -55
- data/lib/chef/provider/powershell_script.rb +77 -0
- data/lib/chef/provider/remote_directory.rb +5 -6
- data/lib/chef/provider/remote_file.rb +12 -108
- data/lib/chef/provider/remote_file/cache_control_data.rb +165 -0
- data/lib/chef/provider/remote_file/content.rb +75 -0
- data/lib/chef/provider/remote_file/fetcher.rb +43 -0
- data/lib/chef/provider/remote_file/ftp.rb +183 -0
- data/lib/chef/provider/remote_file/http.rb +124 -0
- data/lib/chef/provider/remote_file/local_file.rb +47 -0
- data/lib/chef/provider/route.rb +6 -2
- data/lib/chef/provider/script.rb +14 -2
- data/lib/chef/provider/service/macosx.rb +16 -10
- data/lib/chef/provider/service/solaris.rb +6 -5
- data/lib/chef/provider/template.rb +16 -78
- data/lib/chef/provider/template/content.rb +61 -0
- data/lib/chef/provider/user/solaris.rb +90 -0
- data/lib/chef/provider/user/useradd.rb +76 -63
- data/lib/chef/provider/windows_script.rb +73 -0
- data/lib/chef/providers.rb +16 -0
- data/lib/chef/resource.rb +23 -2
- data/lib/chef/resource/batch.rb +31 -0
- data/lib/chef/resource/conditional.rb +4 -0
- data/lib/chef/resource/conditional_action_not_nothing.rb +48 -0
- data/lib/chef/resource/file.rb +31 -3
- data/lib/chef/resource/link.rb +17 -0
- data/lib/chef/resource/lwrp_base.rb +1 -1
- data/lib/chef/resource/mount.rb +29 -2
- data/lib/chef/resource/powershell_script.rb +31 -0
- data/lib/chef/resource/remote_file.rb +47 -1
- data/lib/chef/resource/route.rb +1 -1
- data/lib/chef/resource/template.rb +145 -0
- data/lib/chef/resource/windows_script.rb +62 -0
- data/lib/chef/resource_collection.rb +45 -11
- data/lib/chef/resource_reporter.rb +81 -52
- data/lib/chef/resources.rb +2 -0
- data/lib/chef/rest.rb +13 -4
- data/lib/chef/rest/rest_request.rb +5 -1
- data/lib/chef/run_context/cookbook_compiler.rb +3 -3
- data/lib/chef/run_list/run_list_expansion.rb +1 -1
- data/lib/chef/run_lock.rb +7 -1
- data/lib/chef/runner.rb +0 -1
- data/lib/chef/scan_access_control.rb +6 -1
- data/lib/chef/search/query.rb +2 -2
- data/lib/chef/shell/shell_session.rb +2 -2
- data/lib/chef/util/backup.rb +84 -0
- data/lib/chef/util/diff.rb +145 -0
- data/lib/chef/util/file_edit.rb +1 -1
- data/lib/chef/util/selinux.rb +100 -0
- data/lib/chef/util/windows/net_user.rb +14 -1
- data/lib/chef/util/windows/volume.rb +2 -2
- data/lib/chef/version.rb +1 -1
- data/lib/chef/version/platform.rb +42 -0
- data/lib/chef/version_class.rb +1 -1
- data/lib/chef/version_constraint.rb +6 -5
- data/lib/chef/version_constraint/platform.rb +26 -0
- data/lib/chef/win32/api/file.rb +8 -2
- data/lib/chef/win32/version.rb +25 -8
- data/spec/data/apt/chef-integration-test-1.0/debian/changelog +5 -0
- data/spec/data/apt/chef-integration-test-1.0/debian/compat +1 -0
- data/spec/data/apt/chef-integration-test-1.0/debian/control +13 -0
- data/spec/data/apt/chef-integration-test-1.0/debian/copyright +34 -0
- data/spec/data/apt/chef-integration-test-1.0/debian/files +1 -0
- data/spec/data/apt/chef-integration-test-1.0/debian/rules +13 -0
- data/spec/data/apt/chef-integration-test-1.0/debian/source/format +1 -0
- data/spec/data/apt/chef-integration-test-1.1/debian/changelog +11 -0
- data/spec/data/apt/chef-integration-test-1.1/debian/compat +1 -0
- data/spec/data/apt/chef-integration-test-1.1/debian/control +13 -0
- data/spec/data/apt/chef-integration-test-1.1/debian/copyright +34 -0
- data/spec/data/apt/chef-integration-test-1.1/debian/files +1 -0
- data/spec/data/apt/chef-integration-test-1.1/debian/rules +13 -0
- data/spec/data/apt/chef-integration-test-1.1/debian/source/format +1 -0
- data/spec/data/apt/chef-integration-test_1.0-1_amd64.changes +22 -0
- data/spec/data/apt/chef-integration-test_1.0-1_amd64.deb +0 -0
- data/spec/data/apt/chef-integration-test_1.0.orig.tar.gz +0 -0
- data/spec/data/apt/chef-integration-test_1.1-1_amd64.changes +22 -0
- data/spec/data/apt/chef-integration-test_1.1-1_amd64.deb +0 -0
- data/spec/data/apt/chef-integration-test_1.1.orig.tar.gz +0 -0
- data/spec/data/apt/var/www/apt/conf/distributions +7 -0
- data/spec/data/apt/var/www/apt/conf/incoming +4 -0
- data/spec/data/apt/var/www/apt/conf/pulls +3 -0
- data/spec/data/apt/var/www/apt/db/checksums.db +0 -0
- data/spec/data/apt/var/www/apt/db/contents.cache.db +0 -0
- data/spec/data/apt/var/www/apt/db/packages.db +0 -0
- data/spec/data/apt/var/www/apt/db/references.db +0 -0
- data/spec/data/apt/var/www/apt/db/release.caches.db +0 -0
- data/spec/data/apt/var/www/apt/db/version +4 -0
- data/spec/data/apt/var/www/apt/dists/sid/Release +19 -0
- data/spec/data/apt/var/www/apt/dists/sid/main/binary-amd64/Packages +16 -0
- data/spec/data/apt/var/www/apt/dists/sid/main/binary-amd64/Packages.gz +0 -0
- data/spec/data/apt/var/www/apt/dists/sid/main/binary-amd64/Release +5 -0
- data/spec/data/apt/var/www/apt/dists/sid/main/binary-i386/Packages +0 -0
- data/spec/data/apt/var/www/apt/pool/main/c/chef-integration-test/chef-integration-test_1.0-1_amd64.deb +0 -0
- data/spec/data/apt/var/www/apt/pool/main/c/chef-integration-test/chef-integration-test_1.1-1_amd64.deb +0 -0
- data/spec/data/bootstrap/encrypted_data_bag_secret +1 -0
- data/spec/data/bootstrap/secret.erb +9 -0
- data/spec/data/cookbooks/ignorken/recipes/default.rb +1 -0
- data/spec/data/cookbooks/ignorken/recipes/ignoreme.rb +2 -0
- data/spec/data/cookbooks/openldap/files/default/.dotfile +1 -0
- data/spec/data/cookbooks/openldap/files/default/.ssh/id_rsa +1 -0
- data/spec/data/cookbooks/openldap/files/default/remotedir/.a_dotdir/.a_dotfile_in_a_dotdir +1 -0
- data/spec/data/cookbooks/openldap/files/default/remotedir/remotesubdir/.a_dotfile +1 -0
- data/spec/data/cookbooks/openldap/templates/default/all_windows_line_endings.erb +4 -0
- data/spec/data/cookbooks/openldap/templates/default/helper_test.erb +1 -0
- data/spec/data/cookbooks/openldap/templates/default/helpers_via_partial_test.erb +1 -0
- data/spec/data/cookbooks/openldap/templates/default/no_windows_line_endings.erb +4 -0
- data/spec/data/cookbooks/openldap/templates/default/some_windows_line_endings.erb +4 -0
- data/spec/data/cookbooks/preseed/files/default/preseed-file.seed +1 -0
- data/spec/data/cookbooks/preseed/templates/default/preseed-template.seed +1 -0
- data/spec/data/file-providers-method-snapshot-chef-11-4.json +127 -0
- data/spec/data/git_bundles/example-repo.gitbundle +0 -0
- data/spec/data/knife-home/.chef/plugins/knife/example_home_subcommand.rb +0 -0
- data/spec/data/knife_subcommand/test_yourself.rb +8 -0
- data/spec/data/null_config.rb +1 -0
- data/spec/data/partial_one.erb +1 -1
- data/spec/data/remote_file/nyan_cat.png.gz +0 -0
- data/spec/functional/file_content_management/deploy_strategies_spec.rb +238 -0
- data/spec/functional/knife/exec_spec.rb +2 -2
- data/spec/functional/provider/remote_file/cache_control_data_spec.rb +101 -0
- data/spec/functional/resource/batch_spec.rb +64 -0
- data/spec/functional/resource/cookbook_file_spec.rb +2 -3
- data/spec/functional/resource/deploy_revision_spec.rb +180 -0
- data/spec/functional/resource/directory_spec.rb +2 -2
- data/spec/functional/resource/file_spec.rb +17 -1
- data/spec/functional/resource/git_spec.rb +259 -0
- data/spec/functional/resource/link_spec.rb +422 -388
- data/spec/functional/resource/package_spec.rb +297 -0
- data/spec/functional/resource/powershell_spec.rb +188 -0
- data/spec/functional/resource/registry_spec.rb +8 -4
- data/spec/functional/resource/remote_directory_spec.rb +2 -2
- data/spec/functional/resource/remote_file_spec.rb +97 -29
- data/spec/functional/resource/template_spec.rb +173 -17
- data/spec/functional/resource/user_spec.rb +547 -0
- data/spec/functional/run_lock_spec.rb +5 -0
- data/spec/functional/shell_spec.rb +2 -1
- data/spec/functional/win32/service_manager_spec.rb +269 -0
- data/spec/functional/win32/versions_spec.rb +78 -0
- data/spec/integration/knife/chef_repo_path_spec.rb +805 -0
- data/spec/integration/knife/chef_repository_file_system_spec.rb +276 -0
- data/spec/integration/knife/chefignore_spec.rb +271 -0
- data/spec/integration/knife/delete_spec.rb +944 -0
- data/spec/integration/knife/deps_spec.rb +648 -0
- data/spec/integration/knife/diff_spec.rb +536 -0
- data/spec/integration/knife/download_spec.rb +962 -0
- data/spec/integration/knife/list_spec.rb +633 -0
- data/spec/integration/knife/raw_spec.rb +166 -0
- data/spec/integration/knife/redirection_spec.rb +57 -0
- data/spec/integration/knife/show_spec.rb +158 -0
- data/spec/integration/knife/upload_spec.rb +1060 -0
- data/spec/integration/solo/solo_spec.rb +41 -0
- data/spec/spec_helper.rb +55 -1
- data/spec/support/chef_helpers.rb +32 -0
- data/spec/support/platform_helpers.rb +40 -0
- data/spec/support/platforms/win32/spec_service.rb +59 -0
- data/spec/support/shared/functional/directory_resource.rb +43 -16
- data/spec/support/shared/functional/file_resource.rb +661 -20
- data/spec/support/shared/functional/securable_resource.rb +109 -8
- data/spec/support/shared/functional/securable_resource_with_reporting.rb +39 -31
- data/spec/support/shared/integration/integration_helper.rb +166 -0
- data/spec/support/shared/integration/knife_support.rb +171 -0
- data/spec/support/shared/unit/execute_resource.rb +125 -0
- data/spec/support/shared/unit/file_system_support.rb +8 -48
- data/spec/support/shared/unit/provider/file.rb +609 -0
- data/spec/support/shared/unit/provider/useradd_based_user_provider.rb +407 -0
- data/spec/support/shared/unit/script_resource.rb +52 -0
- data/spec/support/shared/unit/windows_script_resource.rb +48 -0
- data/spec/tiny_server.rb +13 -11
- data/spec/unit/application/client_spec.rb +39 -1
- data/spec/unit/application/knife_spec.rb +12 -0
- data/spec/unit/application/solo_spec.rb +1 -1
- data/spec/unit/application_spec.rb +57 -2
- data/spec/unit/chef_fs/diff_spec.rb +30 -31
- data/spec/unit/chef_fs/file_pattern_spec.rb +2 -2
- data/spec/unit/chef_fs/file_system_spec.rb +2 -3
- data/spec/unit/client_spec.rb +20 -1
- data/spec/unit/config_spec.rb +70 -52
- data/spec/unit/cookbook/synchronizer_spec.rb +49 -1
- data/spec/unit/cookbook/syntax_check_spec.rb +28 -3
- data/spec/unit/cookbook_loader_spec.rb +3 -2
- data/spec/unit/daemon_spec.rb +7 -7
- data/spec/unit/data_bag_spec.rb +7 -0
- data/spec/unit/deprecation_spec.rb +86 -0
- data/spec/unit/encrypted_data_bag_item_spec.rb +183 -88
- data/spec/unit/environment_spec.rb +98 -0
- data/spec/unit/exceptions_spec.rb +6 -1
- data/spec/unit/file_access_control_spec.rb +21 -1
- data/spec/unit/file_content_management/deploy/cp_spec.rb +46 -0
- data/spec/unit/file_content_management/deploy/mv_unix_spec.rb +103 -0
- data/spec/unit/file_content_management/deploy/mv_windows_spec.rb +179 -0
- data/spec/unit/formatters/error_inspectors/cookbook_resolve_error_inspector_spec.rb +38 -2
- data/spec/unit/formatters/error_inspectors/resource_failure_inspector_spec.rb +3 -2
- data/spec/unit/knife/bootstrap_spec.rb +128 -29
- data/spec/unit/knife/configure_spec.rb +42 -26
- data/spec/unit/knife/cookbook_download_spec.rb +24 -3
- data/spec/unit/knife/cookbook_upload_spec.rb +8 -4
- data/spec/unit/knife/core/bootstrap_context_spec.rb +78 -61
- data/spec/unit/knife/core/subcommand_loader_spec.rb +20 -0
- data/spec/unit/knife/core/ui_spec.rb +41 -0
- data/spec/unit/knife/node_run_list_set_spec.rb +140 -0
- data/spec/unit/knife_spec.rb +21 -0
- data/spec/unit/mixin/enforce_ownership_and_permissions_spec.rb +1 -0
- data/spec/unit/mixin/params_validate_spec.rb +35 -0
- data/spec/unit/mixin/template_spec.rb +69 -57
- data/spec/unit/mixin/windows_architecture_helper_spec.rb +83 -0
- data/spec/unit/node_spec.rb +7 -0
- data/spec/unit/platform_spec.rb +15 -1
- data/spec/unit/provider/cookbook_file/content_spec.rb +40 -0
- data/spec/unit/provider/cookbook_file_spec.rb +26 -183
- data/spec/unit/provider/cron/solaris_spec.rb +1 -1
- data/spec/unit/provider/deploy/revision_spec.rb +19 -11
- data/spec/unit/provider/deploy_spec.rb +2 -2
- data/spec/unit/provider/directory_spec.rb +23 -23
- data/spec/unit/provider/execute_spec.rb +27 -1
- data/spec/unit/provider/file/content_spec.rb +101 -0
- data/spec/unit/provider/file_spec.rb +25 -484
- data/spec/unit/provider/git_spec.rb +224 -28
- data/spec/unit/provider/group/usermod_spec.rb +3 -1
- data/spec/unit/provider/ifconfig/debian_spec.rb +89 -0
- data/spec/unit/provider/ifconfig/redhat_spec.rb +71 -0
- data/spec/unit/provider/ifconfig_spec.rb +0 -33
- data/spec/unit/provider/mount/mount_spec.rb +33 -2
- data/spec/unit/provider/mount/windows_spec.rb +4 -1
- data/spec/unit/provider/mount_spec.rb +16 -6
- data/spec/unit/provider/package/portage_spec.rb +44 -0
- data/spec/unit/provider/package/rubygems_spec.rb +44 -1
- data/spec/unit/provider/package/smartos_spec.rb +3 -2
- data/spec/unit/provider/package/yum_spec.rb +36 -39
- data/spec/unit/provider/package/zypper_spec.rb +84 -22
- data/spec/unit/provider/package_spec.rb +0 -4
- data/spec/unit/provider/powershell_spec.rb +38 -0
- data/spec/unit/provider/remote_directory_spec.rb +0 -4
- data/spec/unit/provider/remote_file/cache_control_data_spec.rb +211 -0
- data/spec/unit/provider/remote_file/content_spec.rb +230 -0
- data/spec/unit/provider/remote_file/fetcher_spec.rb +75 -0
- data/spec/unit/provider/remote_file/ftp_spec.rb +224 -0
- data/spec/unit/provider/remote_file/http_spec.rb +319 -0
- data/spec/unit/provider/remote_file/local_file_spec.rb +60 -0
- data/spec/unit/provider/remote_file_spec.rb +33 -295
- data/spec/unit/provider/route_spec.rb +25 -9
- data/spec/unit/provider/service/macosx_spec.rb +176 -152
- data/spec/unit/provider/service/solaris_smf_service_spec.rb +21 -18
- data/spec/unit/provider/service/systemd_service_spec.rb +2 -2
- data/spec/unit/provider/service/upstart_service_spec.rb +2 -2
- data/spec/unit/provider/service_spec.rb +3 -3
- data/spec/unit/provider/template/content_spec.rb +78 -0
- data/spec/unit/provider/template_spec.rb +52 -184
- data/spec/unit/provider/user/solaris_spec.rb +80 -0
- data/spec/unit/provider/user/useradd_spec.rb +12 -358
- data/spec/unit/resource/batch_spec.rb +48 -0
- data/spec/unit/resource/conditional_action_not_nothing_spec.rb +45 -0
- data/spec/unit/resource/execute_spec.rb +3 -101
- data/spec/unit/resource/file_spec.rb +0 -5
- data/spec/unit/resource/group_spec.rb +9 -0
- data/spec/unit/resource/ifconfig_spec.rb +60 -1
- data/spec/unit/resource/link_spec.rb +1 -0
- data/spec/unit/resource/mount_spec.rb +37 -0
- data/spec/unit/resource/powershell_spec.rb +48 -0
- data/spec/unit/resource/remote_file_spec.rb +44 -4
- data/spec/unit/resource/route_spec.rb +1 -1
- data/spec/unit/resource/script_spec.rb +13 -36
- data/spec/unit/resource/template_spec.rb +111 -8
- data/spec/unit/resource/user_spec.rb +7 -0
- data/spec/unit/resource_collection_spec.rb +61 -32
- data/spec/unit/resource_reporter_spec.rb +115 -102
- data/spec/unit/resource_spec.rb +170 -1
- data/spec/unit/rest/auth_credentials_spec.rb +2 -2
- data/spec/unit/rest_spec.rb +6 -2
- data/spec/unit/run_context/cookbook_compiler_spec.rb +9 -0
- data/spec/unit/runner_spec.rb +1 -1
- data/spec/unit/scan_access_control_spec.rb +4 -2
- data/spec/unit/shell/shell_session_spec.rb +15 -2
- data/spec/unit/util/backup_spec.rb +149 -0
- data/spec/unit/util/diff_spec.rb +596 -0
- data/spec/unit/util/selinux_spec.rb +172 -0
- data/spec/unit/version/platform_spec.rb +61 -0
- data/spec/unit/version_constraint/platform_spec.rb +46 -0
- data/spec/unit/version_constraint_spec.rb +5 -0
- metadata +233 -10
- data/lib/chef/chef_fs/file_system/data_bag_item.rb +0 -59
- data/spec/unit/chef_fs/file_system/chef_server_root_dir_spec.rb +0 -237
- data/spec/unit/chef_fs/file_system/cookbooks_dir_spec.rb +0 -568
- data/spec/unit/chef_fs/file_system/data_bags_dir_spec.rb +0 -220
@@ -0,0 +1,205 @@
|
|
1
|
+
#
|
2
|
+
# Author:: John Keiser (<jkeiser@opscode.com>)
|
3
|
+
# Copyright:: Copyright (c) 2012 Opscode, 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 'chef/log'
|
20
|
+
require 'chef/chef_fs/path_utils'
|
21
|
+
|
22
|
+
class Chef
|
23
|
+
module ChefFS
|
24
|
+
#
|
25
|
+
# Helpers to take Chef::Config and create chef_fs and local_fs from it
|
26
|
+
#
|
27
|
+
class Config
|
28
|
+
def initialize(chef_config = Chef::Config, cwd = Dir.pwd)
|
29
|
+
@chef_config = chef_config
|
30
|
+
@cwd = cwd
|
31
|
+
configure_repo_paths
|
32
|
+
end
|
33
|
+
|
34
|
+
PATH_VARIABLES = %w(acl_path client_path cookbook_path container_path data_bag_path environment_path group_path node_path role_path user_path)
|
35
|
+
|
36
|
+
def chef_fs
|
37
|
+
@chef_fs ||= create_chef_fs
|
38
|
+
end
|
39
|
+
|
40
|
+
def create_chef_fs
|
41
|
+
require 'chef/chef_fs/file_system/chef_server_root_dir'
|
42
|
+
Chef::ChefFS::FileSystem::ChefServerRootDir.new("remote", @chef_config)
|
43
|
+
end
|
44
|
+
|
45
|
+
def local_fs
|
46
|
+
@local_fs ||= create_local_fs
|
47
|
+
end
|
48
|
+
|
49
|
+
def create_local_fs
|
50
|
+
require 'chef/chef_fs/file_system/chef_repository_file_system_root_dir'
|
51
|
+
Chef::ChefFS::FileSystem::ChefRepositoryFileSystemRootDir.new(object_paths)
|
52
|
+
end
|
53
|
+
|
54
|
+
# Returns the given real path's location relative to the server root.
|
55
|
+
#
|
56
|
+
# If chef_repo is /home/jkeiser/chef_repo,
|
57
|
+
# and pwd is /home/jkeiser/chef_repo/cookbooks,
|
58
|
+
# server_path('blah') == '/cookbooks/blah'
|
59
|
+
# server_path('../roles/blah.json') == '/roles/blah'
|
60
|
+
# server_path('../../readme.txt') == nil
|
61
|
+
# server_path('*/*ab*') == '/cookbooks/*/*ab*'
|
62
|
+
# server_path('/home/jkeiser/chef_repo/cookbooks/blah') == '/cookbooks/blah'
|
63
|
+
# server_path('/home/*/chef_repo/cookbooks/blah') == nil
|
64
|
+
#
|
65
|
+
# If there are multiple paths (cookbooks, roles, data bags, etc. can all
|
66
|
+
# have separate paths), and cwd+the path reaches into one of them, we will
|
67
|
+
# return a path relative to that. Otherwise we will return a path to
|
68
|
+
# chef_repo.
|
69
|
+
#
|
70
|
+
# Globs are allowed as well, but globs outside server paths are NOT
|
71
|
+
# (presently) supported. See above examples. TODO support that.
|
72
|
+
#
|
73
|
+
# If the path does not reach into ANY specified directory, nil is returned.
|
74
|
+
def server_path(file_path)
|
75
|
+
pwd = File.expand_path(Dir.pwd)
|
76
|
+
absolute_path = Chef::ChefFS::PathUtils.realest_path(File.expand_path(file_path, pwd))
|
77
|
+
|
78
|
+
# Check all object paths (cookbooks_dir, data_bags_dir, etc.)
|
79
|
+
object_paths.each_pair do |name, paths|
|
80
|
+
paths.each do |path|
|
81
|
+
realest_path = Chef::ChefFS::PathUtils.realest_path(path)
|
82
|
+
if absolute_path[0,realest_path.length] == realest_path &&
|
83
|
+
(absolute_path.length == realest_path.length ||
|
84
|
+
absolute_path[realest_path.length,1] =~ /#{PathUtils.regexp_path_separator}/)
|
85
|
+
relative_path = Chef::ChefFS::PathUtils::relative_to(absolute_path, realest_path)
|
86
|
+
return relative_path == '.' ? "/#{name}" : "/#{name}/#{relative_path}"
|
87
|
+
end
|
88
|
+
end
|
89
|
+
end
|
90
|
+
|
91
|
+
# Check chef_repo_path
|
92
|
+
Array(@chef_config[:chef_repo_path]).flatten.each do |chef_repo_path|
|
93
|
+
realest_chef_repo_path = Chef::ChefFS::PathUtils.realest_path(chef_repo_path)
|
94
|
+
if absolute_path == realest_chef_repo_path
|
95
|
+
return '/'
|
96
|
+
end
|
97
|
+
end
|
98
|
+
|
99
|
+
nil
|
100
|
+
end
|
101
|
+
|
102
|
+
# The current directory, relative to server root
|
103
|
+
def base_path
|
104
|
+
@base_path ||= begin
|
105
|
+
if @chef_config[:chef_repo_path]
|
106
|
+
server_path(File.expand_path(@cwd))
|
107
|
+
else
|
108
|
+
nil
|
109
|
+
end
|
110
|
+
end
|
111
|
+
end
|
112
|
+
|
113
|
+
# Print the given server path, relative to the current directory
|
114
|
+
def format_path(entry)
|
115
|
+
server_path = entry.path
|
116
|
+
if base_path && server_path[0,base_path.length] == base_path
|
117
|
+
if server_path == base_path
|
118
|
+
return "."
|
119
|
+
elsif server_path[base_path.length,1] == "/"
|
120
|
+
return server_path[base_path.length + 1, server_path.length - base_path.length - 1]
|
121
|
+
elsif base_path == "/" && server_path[0,1] == "/"
|
122
|
+
return server_path[1, server_path.length - 1]
|
123
|
+
end
|
124
|
+
end
|
125
|
+
server_path
|
126
|
+
end
|
127
|
+
|
128
|
+
def require_chef_repo_path
|
129
|
+
if !@chef_config[:chef_repo_path]
|
130
|
+
Chef::Log.error("Must specify either chef_repo_path or cookbook_path in Chef config file")
|
131
|
+
exit(1)
|
132
|
+
end
|
133
|
+
end
|
134
|
+
|
135
|
+
private
|
136
|
+
|
137
|
+
def object_paths
|
138
|
+
@object_paths ||= begin
|
139
|
+
require_chef_repo_path
|
140
|
+
|
141
|
+
result = {}
|
142
|
+
case @chef_config[:repo_mode]
|
143
|
+
when 'static'
|
144
|
+
object_names = %w(cookbooks data_bags environments roles)
|
145
|
+
when 'hosted_everything'
|
146
|
+
object_names = %w(acls clients cookbooks containers data_bags environments groups nodes roles)
|
147
|
+
else
|
148
|
+
object_names = %w(clients cookbooks data_bags environments nodes roles users)
|
149
|
+
end
|
150
|
+
object_names.each do |object_name|
|
151
|
+
variable_name = "#{object_name[0..-2]}_path" # cookbooks -> cookbook_path
|
152
|
+
paths = Array(@chef_config[variable_name]).flatten
|
153
|
+
result[object_name] = paths.map { |path| File.expand_path(path) }
|
154
|
+
end
|
155
|
+
result
|
156
|
+
end
|
157
|
+
end
|
158
|
+
|
159
|
+
def configure_repo_paths
|
160
|
+
# Smooth out some (for now) inappropriate defaults set by Chef
|
161
|
+
if @chef_config[:cookbook_path] == [ @chef_config.platform_specific_path("/var/chef/cookbooks"),
|
162
|
+
@chef_config.platform_specific_path("/var/chef/site-cookbooks") ]
|
163
|
+
@chef_config[:cookbook_path] = nil
|
164
|
+
end
|
165
|
+
if @chef_config[:data_bag_path] == @chef_config.platform_specific_path('/var/chef/data_bags')
|
166
|
+
@chef_config[:data_bag_path] = nil
|
167
|
+
end
|
168
|
+
if @chef_config[:node_path] == '/var/chef/node'
|
169
|
+
@chef_config[:node_path] = nil
|
170
|
+
end
|
171
|
+
if @chef_config[:role_path] == @chef_config.platform_specific_path('/var/chef/roles')
|
172
|
+
@chef_config[:role_path] = nil
|
173
|
+
end
|
174
|
+
|
175
|
+
# Infer chef_repo_path from cookbook_path if not speciifed
|
176
|
+
if !@chef_config[:chef_repo_path]
|
177
|
+
if @chef_config[:cookbook_path]
|
178
|
+
@chef_config[:chef_repo_path] = Array(@chef_config[:cookbook_path]).flatten.map { |path| File.expand_path('..', path) }
|
179
|
+
end
|
180
|
+
end
|
181
|
+
|
182
|
+
# Default to getting *everything* from the server.
|
183
|
+
if !@chef_config[:repo_mode]
|
184
|
+
if @chef_config[:chef_server_url] =~ /\/+organizations\/.+/
|
185
|
+
@chef_config[:repo_mode] = 'hosted_everything'
|
186
|
+
else
|
187
|
+
@chef_config[:repo_mode] = 'everything'
|
188
|
+
end
|
189
|
+
end
|
190
|
+
|
191
|
+
# Infer any *_path variables that are not specified
|
192
|
+
if @chef_config[:chef_repo_path]
|
193
|
+
PATH_VARIABLES.each do |variable_name|
|
194
|
+
chef_repo_paths = Array(@chef_config[:chef_repo_path]).flatten
|
195
|
+
variable = variable_name.to_sym
|
196
|
+
if !@chef_config[variable]
|
197
|
+
# cookbook_path -> cookbooks
|
198
|
+
@chef_config[variable] = chef_repo_paths.map { |path| File.join(path, "#{variable_name[0..-6]}s") }
|
199
|
+
end
|
200
|
+
end
|
201
|
+
end
|
202
|
+
end
|
203
|
+
end
|
204
|
+
end
|
205
|
+
end
|
@@ -0,0 +1,26 @@
|
|
1
|
+
require 'chef/chef_fs/data_handler/data_handler_base'
|
2
|
+
|
3
|
+
class Chef
|
4
|
+
module ChefFS
|
5
|
+
module DataHandler
|
6
|
+
class AclDataHandler < DataHandlerBase
|
7
|
+
def normalize(node, entry)
|
8
|
+
# Normalize the order of the keys for easier reading
|
9
|
+
result = normalize_hash(node, {
|
10
|
+
'create' => {},
|
11
|
+
'read' => {},
|
12
|
+
'update' => {},
|
13
|
+
'delete' => {},
|
14
|
+
'grant' => {}
|
15
|
+
})
|
16
|
+
result.keys.each do |key|
|
17
|
+
result[key] = normalize_hash(result[key], { 'actors' => [], 'groups' => [] })
|
18
|
+
result[key]['actors'] = result[key]['actors'].sort
|
19
|
+
result[key]['groups'] = result[key]['groups'].sort
|
20
|
+
end
|
21
|
+
result
|
22
|
+
end
|
23
|
+
end
|
24
|
+
end
|
25
|
+
end
|
26
|
+
end
|
@@ -0,0 +1,38 @@
|
|
1
|
+
require 'chef/chef_fs/data_handler/data_handler_base'
|
2
|
+
require 'chef/api_client'
|
3
|
+
|
4
|
+
class Chef
|
5
|
+
module ChefFS
|
6
|
+
module DataHandler
|
7
|
+
class ClientDataHandler < DataHandlerBase
|
8
|
+
def normalize(client, entry)
|
9
|
+
defaults = {
|
10
|
+
'name' => remove_dot_json(entry.name),
|
11
|
+
'clientname' => remove_dot_json(entry.name),
|
12
|
+
'orgname' => entry.org,
|
13
|
+
'admin' => false,
|
14
|
+
'validator' => false,
|
15
|
+
'chef_type' => 'client'
|
16
|
+
}
|
17
|
+
if entry.org
|
18
|
+
defaults['orgname'] = entry.org
|
19
|
+
end
|
20
|
+
result = normalize_hash(client, defaults)
|
21
|
+
# You can NOT send json_class, or it will fail
|
22
|
+
result.delete('json_class')
|
23
|
+
result
|
24
|
+
end
|
25
|
+
|
26
|
+
def preserve_key(key)
|
27
|
+
return key == 'name'
|
28
|
+
end
|
29
|
+
|
30
|
+
def chef_class
|
31
|
+
Chef::ApiClient
|
32
|
+
end
|
33
|
+
|
34
|
+
# There is no Ruby API for Chef::ApiClient
|
35
|
+
end
|
36
|
+
end
|
37
|
+
end
|
38
|
+
end
|
@@ -0,0 +1,29 @@
|
|
1
|
+
require 'chef/chef_fs/data_handler/data_handler_base'
|
2
|
+
|
3
|
+
class Chef
|
4
|
+
module ChefFS
|
5
|
+
module DataHandler
|
6
|
+
class ContainerDataHandler < DataHandlerBase
|
7
|
+
def normalize(container, entry)
|
8
|
+
normalize_hash(container, {
|
9
|
+
'containername' => remove_dot_json(entry.name),
|
10
|
+
'containerpath' => remove_dot_json(entry.name)
|
11
|
+
})
|
12
|
+
end
|
13
|
+
|
14
|
+
def preserve_key(key)
|
15
|
+
return key == 'containername'
|
16
|
+
end
|
17
|
+
|
18
|
+
def verify_integrity(object, entry, &on_error)
|
19
|
+
base_name = remove_dot_json(entry.name)
|
20
|
+
if object['containername'] != base_name
|
21
|
+
on_error.call("Name in #{entry.path_for_printing} must be '#{base_name}' (is '#{object['name']}')")
|
22
|
+
end
|
23
|
+
end
|
24
|
+
|
25
|
+
# There is no chef_class for users, nor does to_ruby work.
|
26
|
+
end
|
27
|
+
end
|
28
|
+
end
|
29
|
+
end
|
@@ -0,0 +1,38 @@
|
|
1
|
+
require 'chef/chef_fs/data_handler/data_handler_base'
|
2
|
+
require 'chef/cookbook/metadata'
|
3
|
+
|
4
|
+
class Chef
|
5
|
+
module ChefFS
|
6
|
+
module DataHandler
|
7
|
+
class CookbookDataHandler < DataHandlerBase
|
8
|
+
def normalize(cookbook, entry)
|
9
|
+
version = entry.name
|
10
|
+
name = entry.parent.name
|
11
|
+
result = normalize_hash(cookbook, {
|
12
|
+
'name' => "#{name}-#{version}",
|
13
|
+
'version' => version,
|
14
|
+
'cookbook_name' => name,
|
15
|
+
'json_class' => 'Chef::CookbookVersion',
|
16
|
+
'chef_type' => 'cookbook_version',
|
17
|
+
'frozen?' => false,
|
18
|
+
'metadata' => {}
|
19
|
+
})
|
20
|
+
result['metadata'] = normalize_hash(result['metadata'], {
|
21
|
+
'version' => version,
|
22
|
+
'name' => name
|
23
|
+
})
|
24
|
+
end
|
25
|
+
|
26
|
+
def preserve_key(key)
|
27
|
+
return key == 'cookbook_name' || key == 'version'
|
28
|
+
end
|
29
|
+
|
30
|
+
def chef_class
|
31
|
+
Chef::Cookbook::Metadata
|
32
|
+
end
|
33
|
+
|
34
|
+
# Not using this yet, so not sure if to_ruby will be useful.
|
35
|
+
end
|
36
|
+
end
|
37
|
+
end
|
38
|
+
end
|
@@ -0,0 +1,56 @@
|
|
1
|
+
require 'chef/chef_fs/data_handler/data_handler_base'
|
2
|
+
require 'chef/data_bag_item'
|
3
|
+
|
4
|
+
class Chef
|
5
|
+
module ChefFS
|
6
|
+
module DataHandler
|
7
|
+
class DataBagItemDataHandler < DataHandlerBase
|
8
|
+
def normalize(data_bag_item, entry)
|
9
|
+
# If it's wrapped with raw_data, unwrap it.
|
10
|
+
if data_bag_item['json_class'] == 'Chef::DataBagItem' && data_bag_item['raw_data']
|
11
|
+
data_bag_item = data_bag_item['raw_data']
|
12
|
+
end
|
13
|
+
# chef_type and data_bag come back in PUT and POST results, but we don't
|
14
|
+
# use those in knife-essentials.
|
15
|
+
normalize_hash(data_bag_item, {
|
16
|
+
'id' => remove_dot_json(entry.name)
|
17
|
+
})
|
18
|
+
end
|
19
|
+
|
20
|
+
def normalize_for_post(data_bag_item, entry)
|
21
|
+
if data_bag_item['json_class'] == 'Chef::DataBagItem' && data_bag_item['raw_data']
|
22
|
+
data_bag_item = data_bag_item['raw_data']
|
23
|
+
end
|
24
|
+
{
|
25
|
+
"name" => "data_bag_item_#{entry.parent.name}_#{remove_dot_json(entry.name)}",
|
26
|
+
"json_class" => "Chef::DataBagItem",
|
27
|
+
"chef_type" => "data_bag_item",
|
28
|
+
"data_bag" => entry.parent.name,
|
29
|
+
"raw_data" => normalize(data_bag_item, entry)
|
30
|
+
}
|
31
|
+
end
|
32
|
+
|
33
|
+
def normalize_for_put(data_bag_item, entry)
|
34
|
+
normalize_for_post(data_bag_item, entry)
|
35
|
+
end
|
36
|
+
|
37
|
+
def preserve_key(key)
|
38
|
+
return key == 'id'
|
39
|
+
end
|
40
|
+
|
41
|
+
def chef_class
|
42
|
+
Chef::DataBagItem
|
43
|
+
end
|
44
|
+
|
45
|
+
def verify_integrity(object, entry, &on_error)
|
46
|
+
base_name = remove_dot_json(entry.name)
|
47
|
+
if object['raw_data']['id'] != base_name
|
48
|
+
on_error.call("ID in #{entry.path_for_printing} must be '#{base_name}' (is '#{object['raw_data']['id']}')")
|
49
|
+
end
|
50
|
+
end
|
51
|
+
|
52
|
+
# Data bags do not support .rb files (or if they do, it's undocumented)
|
53
|
+
end
|
54
|
+
end
|
55
|
+
end
|
56
|
+
end
|
@@ -0,0 +1,128 @@
|
|
1
|
+
class Chef
|
2
|
+
module ChefFS
|
3
|
+
module DataHandler
|
4
|
+
class DataHandlerBase
|
5
|
+
def minimize(object, entry)
|
6
|
+
default_object = default(entry)
|
7
|
+
object.each_pair do |key, value|
|
8
|
+
if default_object[key] == value && !preserve_key(key)
|
9
|
+
object.delete(key)
|
10
|
+
end
|
11
|
+
end
|
12
|
+
object
|
13
|
+
end
|
14
|
+
|
15
|
+
def remove_dot_json(name)
|
16
|
+
if name.length < 5 || name[-5,5] != ".json"
|
17
|
+
raise "Invalid name #{path}: must end in .json"
|
18
|
+
end
|
19
|
+
name[0,name.length-5]
|
20
|
+
end
|
21
|
+
|
22
|
+
def preserve_key(key)
|
23
|
+
false
|
24
|
+
end
|
25
|
+
|
26
|
+
def default(entry)
|
27
|
+
normalize({}, entry)
|
28
|
+
end
|
29
|
+
|
30
|
+
def normalize_hash(object, defaults)
|
31
|
+
# Make a normalized result in the specified order for diffing
|
32
|
+
result = {}
|
33
|
+
defaults.each_pair do |key, default|
|
34
|
+
result[key] = object.has_key?(key) ? object[key] : default
|
35
|
+
end
|
36
|
+
object.each_pair do |key, value|
|
37
|
+
result[key] = value if !result.has_key?(key)
|
38
|
+
end
|
39
|
+
result
|
40
|
+
end
|
41
|
+
|
42
|
+
def normalize_for_post(object, entry)
|
43
|
+
normalize(object, entry)
|
44
|
+
end
|
45
|
+
|
46
|
+
def normalize_for_put(object, entry)
|
47
|
+
normalize(object, entry)
|
48
|
+
end
|
49
|
+
|
50
|
+
def normalize_run_list(run_list)
|
51
|
+
run_list.map{|item|
|
52
|
+
case item.to_s
|
53
|
+
when /^recipe\[.*\]$/
|
54
|
+
item # explicit recipe
|
55
|
+
when /^role\[.*\]$/
|
56
|
+
item # explicit role
|
57
|
+
else
|
58
|
+
"recipe[#{item}]"
|
59
|
+
end
|
60
|
+
}.uniq
|
61
|
+
end
|
62
|
+
|
63
|
+
def from_ruby(ruby)
|
64
|
+
chef_class.from_file(ruby).to_hash
|
65
|
+
end
|
66
|
+
|
67
|
+
def chef_object(object)
|
68
|
+
chef_class.json_create(object)
|
69
|
+
end
|
70
|
+
|
71
|
+
def to_ruby(object)
|
72
|
+
raise NotImplementedError
|
73
|
+
end
|
74
|
+
|
75
|
+
def chef_class
|
76
|
+
raise NotImplementedError
|
77
|
+
end
|
78
|
+
|
79
|
+
def to_ruby_keys(object, keys)
|
80
|
+
result = ''
|
81
|
+
keys.each do |key|
|
82
|
+
if object[key]
|
83
|
+
if object[key].is_a?(Hash)
|
84
|
+
if object[key].size > 0
|
85
|
+
result << key
|
86
|
+
first = true
|
87
|
+
object[key].each_pair do |k,v|
|
88
|
+
if first
|
89
|
+
first = false
|
90
|
+
else
|
91
|
+
result << ' '*key.length
|
92
|
+
end
|
93
|
+
result << " #{k.inspect} => #{v.inspect}\n"
|
94
|
+
end
|
95
|
+
end
|
96
|
+
elsif object[key].is_a?(Array)
|
97
|
+
if object[key].size > 0
|
98
|
+
result << key
|
99
|
+
first = true
|
100
|
+
object[key].each do |value|
|
101
|
+
if first
|
102
|
+
first = false
|
103
|
+
else
|
104
|
+
result << ", "
|
105
|
+
end
|
106
|
+
result << value.inspect
|
107
|
+
end
|
108
|
+
result << "\n"
|
109
|
+
end
|
110
|
+
elsif !object[key].nil?
|
111
|
+
result << "#{key} #{object[key].inspect}\n"
|
112
|
+
end
|
113
|
+
end
|
114
|
+
end
|
115
|
+
result
|
116
|
+
end
|
117
|
+
|
118
|
+
def verify_integrity(object, entry, &on_error)
|
119
|
+
base_name = remove_dot_json(entry.name)
|
120
|
+
if object['name'] != base_name
|
121
|
+
on_error.call("Name must be '#{base_name}' (is '#{object['name']}')")
|
122
|
+
end
|
123
|
+
end
|
124
|
+
|
125
|
+
end # class DataHandlerBase
|
126
|
+
end
|
127
|
+
end
|
128
|
+
end
|