chef 11.4.4 → 11.6.0.hotfix.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- 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
|
Binary file
|
|
Binary file
|
|
@@ -0,0 +1,22 @@
|
|
|
1
|
+
Format: 1.8
|
|
2
|
+
Date: Thu, 30 Sep 2010 10:09:34 -0600
|
|
3
|
+
Source: chef-integration-test
|
|
4
|
+
Binary: chef-integration-test
|
|
5
|
+
Architecture: amd64
|
|
6
|
+
Version: 1.1-1
|
|
7
|
+
Distribution: unstable
|
|
8
|
+
Urgency: low
|
|
9
|
+
Maintainer: Joshua Timberman <Joshua Timberman <joshua@opscode.com>>
|
|
10
|
+
Changed-By: Joshua Timberman <joshua@opscode.com>
|
|
11
|
+
Description:
|
|
12
|
+
chef-integration-test - Chef integration tests for APT in Cucumber
|
|
13
|
+
Changes:
|
|
14
|
+
chef-integration-test (1.1-1) unstable; urgency=low
|
|
15
|
+
.
|
|
16
|
+
* New upstream release (1.1)
|
|
17
|
+
Checksums-Sha1:
|
|
18
|
+
43c5653a9a5b9419849173a4ec3a9855cf0327a3 1722 chef-integration-test_1.1-1_amd64.deb
|
|
19
|
+
Checksums-Sha256:
|
|
20
|
+
84e2f087f7e11d1b73743007ecfc6b8b34e03f6917c0993b35c0758ee59702c1 1722 chef-integration-test_1.1-1_amd64.deb
|
|
21
|
+
Files:
|
|
22
|
+
4b05bace483dbca54efc21f97ee47e1d 1722 ruby extra chef-integration-test_1.1-1_amd64.deb
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
@@ -0,0 +1,19 @@
|
|
|
1
|
+
Origin: localhost
|
|
2
|
+
Label: apt repository
|
|
3
|
+
Codename: sid
|
|
4
|
+
Date: Thu, 30 Sep 2010 16:33:01 UTC
|
|
5
|
+
Architectures: amd64
|
|
6
|
+
Components: main
|
|
7
|
+
Description: Apt repository
|
|
8
|
+
MD5Sum:
|
|
9
|
+
92ed2cc14e37e9ab23466b27857d29ac 596 main/binary-amd64/Packages
|
|
10
|
+
c7726773341137b71cc971d44ddec4f5 394 main/binary-amd64/Packages.gz
|
|
11
|
+
46cd71c965ce0813c94ef78c836cc7d3 104 main/binary-amd64/Release
|
|
12
|
+
SHA1:
|
|
13
|
+
cde25071c5fcee59cee8dcd773ca419dcb40d946 596 main/binary-amd64/Packages
|
|
14
|
+
ce04daff75d4b27371d691d645282b198045544a 394 main/binary-amd64/Packages.gz
|
|
15
|
+
91ca9531e3afa7a540cabdc6030c6f75d315fec7 104 main/binary-amd64/Release
|
|
16
|
+
SHA256:
|
|
17
|
+
af601ce143f33405425746462973adc0fda3aceb381d1c739851b95ee0814ca3 596 main/binary-amd64/Packages
|
|
18
|
+
15e98119705a08018d4583caabc91d36ba12e6f1c8af0f799a3ec8ca5bfaa80d 394 main/binary-amd64/Packages.gz
|
|
19
|
+
098c599ac5b0a98785336afb2bc9c47002570ffa07dd62321c6f70b9fdb74325 104 main/binary-amd64/Release
|
|
@@ -0,0 +1,16 @@
|
|
|
1
|
+
Package: chef-integration-test
|
|
2
|
+
Version: 1.1-1
|
|
3
|
+
Architecture: amd64
|
|
4
|
+
Maintainer: Joshua Timberman <Joshua Timberman <joshua@opscode.com>>
|
|
5
|
+
Installed-Size: 32
|
|
6
|
+
Homepage: http://tickets.opscode.com
|
|
7
|
+
Priority: extra
|
|
8
|
+
Section: ruby
|
|
9
|
+
Filename: pool/main/c/chef-integration-test/chef-integration-test_1.1-1_amd64.deb
|
|
10
|
+
Size: 1722
|
|
11
|
+
SHA256: 84e2f087f7e11d1b73743007ecfc6b8b34e03f6917c0993b35c0758ee59702c1
|
|
12
|
+
SHA1: 43c5653a9a5b9419849173a4ec3a9855cf0327a3
|
|
13
|
+
MD5sum: 4b05bace483dbca54efc21f97ee47e1d
|
|
14
|
+
Description: Chef integration tests for APT in Cucumber
|
|
15
|
+
This package is used for cucumber integration testing in Chef.
|
|
16
|
+
|
|
Binary file
|
|
File without changes
|
|
Binary file
|
|
Binary file
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
supersekret_from_file
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
# This is fine!
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
I am here to test .dotfiles work in file directories.
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
FAKE KEY
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
this is a dotfile in a dotdir
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
this is a file with a name beginning with a . dot
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
<%= helper_method %>
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
<%= render("helper_test.erb").strip %>
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
chef-integration-test chef-integration-test/sample-var string "hello world"
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
chef-integration-test chef-integration-test/sample-var string "<%= node[:preseed_value] -%>"
|
|
@@ -0,0 +1,127 @@
|
|
|
1
|
+
{
|
|
2
|
+
"Chef::Provider::CookbookFile": [
|
|
3
|
+
"action_create",
|
|
4
|
+
"file_cache_location",
|
|
5
|
+
"resource_cookbook",
|
|
6
|
+
"backup_new_resource",
|
|
7
|
+
"content_stale?",
|
|
8
|
+
"diff_current_from_content",
|
|
9
|
+
"is_binary?",
|
|
10
|
+
"diff_current",
|
|
11
|
+
"setup_acl",
|
|
12
|
+
"compare_content",
|
|
13
|
+
"set_content",
|
|
14
|
+
"update_new_file_state",
|
|
15
|
+
"set_all_access_controls",
|
|
16
|
+
"action_create_if_missing",
|
|
17
|
+
"action_delete",
|
|
18
|
+
"action_touch",
|
|
19
|
+
"backup",
|
|
20
|
+
"deploy_tempfile",
|
|
21
|
+
"shell_out",
|
|
22
|
+
"shell_out!",
|
|
23
|
+
"run_command_compatible_options",
|
|
24
|
+
"checksum",
|
|
25
|
+
"access_controls",
|
|
26
|
+
"enforce_ownership_and_permissions"
|
|
27
|
+
],
|
|
28
|
+
"Chef::Provider::RemoteFile": [
|
|
29
|
+
"action_create",
|
|
30
|
+
"current_resource_matches_target_checksum?",
|
|
31
|
+
"matches_current_checksum?",
|
|
32
|
+
"backup_new_resource",
|
|
33
|
+
"source_file",
|
|
34
|
+
"http_client_opts",
|
|
35
|
+
"diff_current_from_content",
|
|
36
|
+
"is_binary?",
|
|
37
|
+
"diff_current",
|
|
38
|
+
"setup_acl",
|
|
39
|
+
"compare_content",
|
|
40
|
+
"set_content",
|
|
41
|
+
"update_new_file_state",
|
|
42
|
+
"set_all_access_controls",
|
|
43
|
+
"action_create_if_missing",
|
|
44
|
+
"action_delete",
|
|
45
|
+
"action_touch",
|
|
46
|
+
"backup",
|
|
47
|
+
"deploy_tempfile",
|
|
48
|
+
"shell_out",
|
|
49
|
+
"shell_out!",
|
|
50
|
+
"run_command_compatible_options",
|
|
51
|
+
"checksum",
|
|
52
|
+
"access_controls",
|
|
53
|
+
"enforce_ownership_and_permissions"
|
|
54
|
+
],
|
|
55
|
+
"Chef::Provider::Template": [
|
|
56
|
+
"action_create",
|
|
57
|
+
"template_finder",
|
|
58
|
+
"template_location",
|
|
59
|
+
"resource_cookbook",
|
|
60
|
+
"rendered",
|
|
61
|
+
"content_matches?",
|
|
62
|
+
"render_template",
|
|
63
|
+
"diff_current_from_content",
|
|
64
|
+
"is_binary?",
|
|
65
|
+
"diff_current",
|
|
66
|
+
"setup_acl",
|
|
67
|
+
"compare_content",
|
|
68
|
+
"set_content",
|
|
69
|
+
"update_new_file_state",
|
|
70
|
+
"set_all_access_controls",
|
|
71
|
+
"action_create_if_missing",
|
|
72
|
+
"action_delete",
|
|
73
|
+
"action_touch",
|
|
74
|
+
"backup",
|
|
75
|
+
"deploy_tempfile",
|
|
76
|
+
"shell_out",
|
|
77
|
+
"shell_out!",
|
|
78
|
+
"run_command_compatible_options",
|
|
79
|
+
"checksum",
|
|
80
|
+
"access_controls",
|
|
81
|
+
"enforce_ownership_and_permissions"
|
|
82
|
+
],
|
|
83
|
+
"Chef::Provider::Directory": [
|
|
84
|
+
"action_create",
|
|
85
|
+
"action_delete",
|
|
86
|
+
"diff_current_from_content",
|
|
87
|
+
"is_binary?",
|
|
88
|
+
"diff_current",
|
|
89
|
+
"setup_acl",
|
|
90
|
+
"compare_content",
|
|
91
|
+
"set_content",
|
|
92
|
+
"update_new_file_state",
|
|
93
|
+
"set_all_access_controls",
|
|
94
|
+
"action_create_if_missing",
|
|
95
|
+
"action_touch",
|
|
96
|
+
"backup",
|
|
97
|
+
"deploy_tempfile",
|
|
98
|
+
"shell_out",
|
|
99
|
+
"shell_out!",
|
|
100
|
+
"run_command_compatible_options",
|
|
101
|
+
"checksum",
|
|
102
|
+
"access_controls",
|
|
103
|
+
"enforce_ownership_and_permissions"
|
|
104
|
+
],
|
|
105
|
+
"Chef::Provider::File": [
|
|
106
|
+
"diff_current_from_content",
|
|
107
|
+
"is_binary?",
|
|
108
|
+
"diff_current",
|
|
109
|
+
"setup_acl",
|
|
110
|
+
"compare_content",
|
|
111
|
+
"set_content",
|
|
112
|
+
"update_new_file_state",
|
|
113
|
+
"action_create",
|
|
114
|
+
"set_all_access_controls",
|
|
115
|
+
"action_create_if_missing",
|
|
116
|
+
"action_delete",
|
|
117
|
+
"action_touch",
|
|
118
|
+
"backup",
|
|
119
|
+
"deploy_tempfile",
|
|
120
|
+
"shell_out",
|
|
121
|
+
"shell_out!",
|
|
122
|
+
"run_command_compatible_options",
|
|
123
|
+
"checksum",
|
|
124
|
+
"access_controls",
|
|
125
|
+
"enforce_ownership_and_permissions"
|
|
126
|
+
]
|
|
127
|
+
}
|
|
Binary file
|
|
File without changes
|
|
@@ -1,6 +1,14 @@
|
|
|
1
1
|
module KnifeSpecs
|
|
2
2
|
class TestYourself < Chef::Knife
|
|
3
3
|
|
|
4
|
+
class << self
|
|
5
|
+
attr_reader :test_deps_loaded
|
|
6
|
+
end
|
|
7
|
+
|
|
8
|
+
deps do
|
|
9
|
+
@test_deps_loaded = true
|
|
10
|
+
end
|
|
11
|
+
|
|
4
12
|
option :scro, :short => '-s SCRO', :long => '--scro SCRO', :description => 'a configurable setting'
|
|
5
13
|
|
|
6
14
|
attr_reader :ran
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
$__KNIFE_INTEGRATION_FAILSAFE_CHECK << " ole"
|
data/spec/data/partial_one.erb
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
partial one <%= render
|
|
1
|
+
partial one <%= render('test.erb', :cookbook => 'openldap').strip %> calling home
|
|
Binary file
|
|
@@ -0,0 +1,238 @@
|
|
|
1
|
+
#
|
|
2
|
+
# Author:: Daniel DeLeo (<dan@opscode.com>)
|
|
3
|
+
# Copyright:: Copyright (c) 2013 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 'spec_helper'
|
|
20
|
+
|
|
21
|
+
shared_examples_for "a content deploy strategy" do
|
|
22
|
+
|
|
23
|
+
# Ruby 1.8 has no binread
|
|
24
|
+
def binread(file)
|
|
25
|
+
if IO.respond_to?(:binread)
|
|
26
|
+
IO.binread(file)
|
|
27
|
+
else
|
|
28
|
+
IO.read(file)
|
|
29
|
+
end
|
|
30
|
+
end
|
|
31
|
+
|
|
32
|
+
def normalize_mode(mode_int)
|
|
33
|
+
( mode_int & 07777).to_s(8)
|
|
34
|
+
end
|
|
35
|
+
|
|
36
|
+
let(:sandbox_dir) do
|
|
37
|
+
basename = make_tmpname("content-deploy-tests")
|
|
38
|
+
full_path = File.join(CHEF_SPEC_DATA, basename)
|
|
39
|
+
FileUtils.mkdir_p(full_path)
|
|
40
|
+
full_path
|
|
41
|
+
end
|
|
42
|
+
|
|
43
|
+
after do
|
|
44
|
+
FileUtils.rm_rf(sandbox_dir) if File.exist?(sandbox_dir)
|
|
45
|
+
end
|
|
46
|
+
|
|
47
|
+
let(:content_deployer) { described_class.new }
|
|
48
|
+
let(:target_file_path) { File.join(sandbox_dir, "cp-deploy-strategy-target-file.txt") }
|
|
49
|
+
|
|
50
|
+
|
|
51
|
+
describe "creating the file" do
|
|
52
|
+
|
|
53
|
+
##
|
|
54
|
+
# UNIX Context
|
|
55
|
+
let(:default_mode) { normalize_mode(0100666 - File.umask) }
|
|
56
|
+
|
|
57
|
+
it "touches the file to create it (UNIX)", :unix_only do
|
|
58
|
+
content_deployer.create(target_file_path)
|
|
59
|
+
File.should exist(target_file_path)
|
|
60
|
+
file_info = File.stat(target_file_path)
|
|
61
|
+
file_info.should be_owned
|
|
62
|
+
file_info.should be_file
|
|
63
|
+
normalize_mode(file_info.mode).should == default_mode
|
|
64
|
+
end
|
|
65
|
+
|
|
66
|
+
##
|
|
67
|
+
# Window Context
|
|
68
|
+
let(:parent_dir) { File.dirname(target_file_path) }
|
|
69
|
+
|
|
70
|
+
let(:parent_security_descriptor) do
|
|
71
|
+
security_obj = Chef::ReservedNames::Win32::Security::SecurableObject.new(parent_dir)
|
|
72
|
+
security_obj.security_descriptor(true)
|
|
73
|
+
end
|
|
74
|
+
|
|
75
|
+
let(:masks) do
|
|
76
|
+
Chef::ReservedNames::Win32::API::Security
|
|
77
|
+
end
|
|
78
|
+
|
|
79
|
+
def ace_inherits?(ace)
|
|
80
|
+
flags = ace.flags
|
|
81
|
+
(flags & masks::OBJECT_INHERIT_ACE) !=0
|
|
82
|
+
end
|
|
83
|
+
|
|
84
|
+
let(:parent_inheritable_aces) do
|
|
85
|
+
inheritable_aces = parent_security_descriptor.dacl.select do |ace|
|
|
86
|
+
ace_inherits?(ace)
|
|
87
|
+
end
|
|
88
|
+
end
|
|
89
|
+
|
|
90
|
+
# Win2003 has annoying differences in ACL inheritance behavior that make
|
|
91
|
+
# the default ACLs substantially different from those created on subsequent
|
|
92
|
+
# windows versions. The behaviors here are also covered by resource-level
|
|
93
|
+
# tests so we'll skip win2k3 here to keep the tests simple.
|
|
94
|
+
it "touches the file to create it (Windows)", :windows_only, :not_supported_on_win2k3 do
|
|
95
|
+
content_deployer.create(target_file_path)
|
|
96
|
+
File.should exist(target_file_path)
|
|
97
|
+
file_info = File.stat(target_file_path)
|
|
98
|
+
file_info.should be_owned
|
|
99
|
+
file_info.should be_file
|
|
100
|
+
|
|
101
|
+
parent_aces = parent_inheritable_aces
|
|
102
|
+
security_obj = Chef::ReservedNames::Win32::Security::SecurableObject.new(target_file_path)
|
|
103
|
+
|
|
104
|
+
security_descriptor = security_obj.security_descriptor(true)
|
|
105
|
+
security_descriptor.dacl.each_with_index do |ace, index|
|
|
106
|
+
ace.inherited?.should be_true
|
|
107
|
+
ace.mask.should == parent_aces[index].mask
|
|
108
|
+
end
|
|
109
|
+
|
|
110
|
+
end
|
|
111
|
+
end
|
|
112
|
+
|
|
113
|
+
describe "updating the file" do
|
|
114
|
+
|
|
115
|
+
let(:staging_dir) { Dir.mktmpdir }
|
|
116
|
+
|
|
117
|
+
let(:staging_file_content) { "this is the expected content" }
|
|
118
|
+
|
|
119
|
+
let(:staging_file_path) do
|
|
120
|
+
path = File.join(staging_dir, "cp-deploy-strategy-staging-file.txt")
|
|
121
|
+
File.open(path, "w+", 0600) { |f| f.print(staging_file_content) }
|
|
122
|
+
path
|
|
123
|
+
end
|
|
124
|
+
|
|
125
|
+
def unix_invariant_properies(stat_struct)
|
|
126
|
+
unix_invariants.inject({}) do |property_map, property|
|
|
127
|
+
property_map[property] = stat_struct.send(property)
|
|
128
|
+
property_map
|
|
129
|
+
end
|
|
130
|
+
end
|
|
131
|
+
|
|
132
|
+
def win_invariant_properties(sec_obj)
|
|
133
|
+
descriptor = sec_obj.security_descriptor(true)
|
|
134
|
+
security_descriptor_invariants.inject({}) do |prop_map, property|
|
|
135
|
+
prop_map[property] = descriptor.send(property)
|
|
136
|
+
prop_map
|
|
137
|
+
end
|
|
138
|
+
end
|
|
139
|
+
|
|
140
|
+
before do
|
|
141
|
+
content_deployer.create(target_file_path)
|
|
142
|
+
end
|
|
143
|
+
|
|
144
|
+
it "maintains invariant properties on UNIX", :unix_only do
|
|
145
|
+
original_info = File.stat(target_file_path)
|
|
146
|
+
content_deployer.deploy(staging_file_path, target_file_path)
|
|
147
|
+
updated_info = File.stat(target_file_path)
|
|
148
|
+
|
|
149
|
+
unix_invariant_properies(original_info).should == unix_invariant_properies(updated_info)
|
|
150
|
+
end
|
|
151
|
+
|
|
152
|
+
it "maintains invariant properties on Windows", :windows_only do
|
|
153
|
+
original_info = Chef::ReservedNames::Win32::Security::SecurableObject.new(target_file_path)
|
|
154
|
+
content_deployer.deploy(staging_file_path, target_file_path)
|
|
155
|
+
updated_info = Chef::ReservedNames::Win32::Security::SecurableObject.new(target_file_path)
|
|
156
|
+
|
|
157
|
+
win_invariant_properties(original_info).should == win_invariant_properties(updated_info)
|
|
158
|
+
end
|
|
159
|
+
|
|
160
|
+
it "updates the target with content from staged" do
|
|
161
|
+
content_deployer.deploy(staging_file_path, target_file_path)
|
|
162
|
+
binread(target_file_path).should == staging_file_content
|
|
163
|
+
end
|
|
164
|
+
|
|
165
|
+
context "when the owner of the target file is not the owner of the staging file", :requires_root do
|
|
166
|
+
|
|
167
|
+
before do
|
|
168
|
+
File.chown(1337, 1337, target_file_path)
|
|
169
|
+
end
|
|
170
|
+
|
|
171
|
+
it "copies the staging file's content" do
|
|
172
|
+
original_info = File.stat(target_file_path)
|
|
173
|
+
content_deployer.deploy(staging_file_path, target_file_path)
|
|
174
|
+
updated_info = File.stat(target_file_path)
|
|
175
|
+
|
|
176
|
+
unix_invariant_properies(original_info).should == unix_invariant_properies(updated_info)
|
|
177
|
+
end
|
|
178
|
+
|
|
179
|
+
end
|
|
180
|
+
|
|
181
|
+
end
|
|
182
|
+
end
|
|
183
|
+
|
|
184
|
+
describe Chef::FileContentManagement::Deploy::Cp do
|
|
185
|
+
|
|
186
|
+
let(:unix_invariants) do
|
|
187
|
+
[
|
|
188
|
+
:uid,
|
|
189
|
+
:gid,
|
|
190
|
+
:mode,
|
|
191
|
+
:ino
|
|
192
|
+
]
|
|
193
|
+
end
|
|
194
|
+
|
|
195
|
+
let(:security_descriptor_invariants) do
|
|
196
|
+
[
|
|
197
|
+
:owner,
|
|
198
|
+
:group,
|
|
199
|
+
:dacl
|
|
200
|
+
]
|
|
201
|
+
end
|
|
202
|
+
|
|
203
|
+
it_should_behave_like "a content deploy strategy"
|
|
204
|
+
|
|
205
|
+
end
|
|
206
|
+
|
|
207
|
+
describe Chef::FileContentManagement::Deploy::MvUnix, :unix_only do
|
|
208
|
+
|
|
209
|
+
let(:unix_invariants) do
|
|
210
|
+
[
|
|
211
|
+
:uid,
|
|
212
|
+
:gid,
|
|
213
|
+
:mode
|
|
214
|
+
]
|
|
215
|
+
end
|
|
216
|
+
|
|
217
|
+
it_should_behave_like "a content deploy strategy"
|
|
218
|
+
end
|
|
219
|
+
|
|
220
|
+
# On Unix we won't have loaded the file, avoid undefined constant errors:
|
|
221
|
+
class Chef::FileContentManagement::Deploy::MvWindows ; end
|
|
222
|
+
|
|
223
|
+
describe Chef::FileContentManagement::Deploy::MvWindows, :windows_only do
|
|
224
|
+
|
|
225
|
+
context "when a file has no sacl" do
|
|
226
|
+
|
|
227
|
+
let(:security_descriptor_invariants) do
|
|
228
|
+
[
|
|
229
|
+
:owner,
|
|
230
|
+
:group,
|
|
231
|
+
:dacl
|
|
232
|
+
]
|
|
233
|
+
end
|
|
234
|
+
|
|
235
|
+
it_should_behave_like "a content deploy strategy"
|
|
236
|
+
end
|
|
237
|
+
|
|
238
|
+
end
|