chef 10.34.6 → 11.0.0.beta.0
Sign up to get free protection for your applications and to get access to all the features.
- data/CONTRIBUTING.md +155 -0
- data/README.md +89 -0
- data/Rakefile +4 -12
- data/bin/chef-apply +25 -0
- data/bin/chef-shell +34 -0
- data/bin/shef +6 -5
- 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/{shef.1.html → chef-shell.1.html} +49 -46
- data/distro/common/html/chef-solo.8.html +18 -12
- 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 +10 -7
- data/distro/common/html/knife-data-bag.1.html +10 -7
- data/distro/common/html/knife-environment.1.html +8 -6
- data/distro/common/html/knife-exec.1.html +9 -9
- 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 +8 -13
- data/distro/common/man/man1/{shef.1 → chef-shell.1} +21 -57
- 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 +15 -2
- data/distro/common/man/man1/knife-data-bag.1 +15 -2
- data/distro/common/man/man1/knife-environment.1 +12 -2
- data/distro/common/man/man1/knife-exec.1 +4 -7
- 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 +3 -6
- 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 +36 -4
- data/distro/common/man/man8/chef-solr.8 +1 -1
- data/distro/common/markdown/man1/{shef.mkd → chef-shell.mkd} +49 -43
- data/distro/common/markdown/man1/knife-exec.mkd +11 -6
- data/distro/common/markdown/man1/knife.mkd +4 -9
- data/distro/debian/etc/default/chef-client +0 -1
- data/distro/debian/etc/init.d/chef-client +2 -2
- data/lib/chef.rb +2 -5
- data/lib/chef/api_client.rb +20 -130
- data/lib/chef/api_client/registration.rb +126 -0
- data/lib/chef/application.rb +71 -14
- data/lib/chef/application/apply.rb +160 -0
- data/lib/chef/application/client.rb +25 -18
- data/lib/chef/application/knife.rb +0 -2
- data/lib/chef/application/solo.rb +23 -8
- data/lib/chef/application/windows_service.rb +5 -2
- data/lib/chef/applications.rb +1 -0
- data/lib/chef/chef_fs.rb +11 -0
- data/lib/chef/chef_fs/command_line.rb +232 -0
- data/lib/chef/chef_fs/file_pattern.rb +312 -0
- data/lib/chef/chef_fs/file_system.rb +358 -0
- data/lib/chef/chef_fs/file_system/base_fs_dir.rb +47 -0
- data/lib/chef/chef_fs/file_system/base_fs_object.rb +121 -0
- data/lib/chef/chef_fs/file_system/chef_repository_file_system_entry.rb +109 -0
- data/{spec/unit/monkey_patches/uri_spec.rb → lib/chef/chef_fs/file_system/chef_repository_file_system_root_dir.rb} +12 -15
- data/lib/chef/chef_fs/file_system/chef_server_root_dir.rb +84 -0
- data/lib/chef/chef_fs/file_system/cookbook_dir.rb +188 -0
- data/lib/chef/chef_fs/file_system/cookbook_file.rb +78 -0
- data/lib/chef/chef_fs/file_system/cookbook_subdir.rb +54 -0
- data/lib/chef/chef_fs/file_system/cookbooks_dir.rb +68 -0
- data/lib/chef/chef_fs/file_system/data_bag_dir.rb +78 -0
- data/lib/chef/chef_fs/file_system/data_bag_item.rb +59 -0
- data/lib/chef/chef_fs/file_system/data_bags_dir.rb +66 -0
- data/lib/chef/chef_fs/file_system/file_system_entry.rb +90 -0
- data/lib/chef/{index_queue.rb → chef_fs/file_system/file_system_error.rb} +14 -12
- data/lib/chef/{resource/whyrun_safe_ruby_block.rb → chef_fs/file_system/file_system_root_dir.rb} +10 -10
- data/lib/chef/chef_fs/file_system/must_delete_recursively_error.rb +31 -0
- data/lib/chef/chef_fs/file_system/nodes_dir.rb +47 -0
- data/lib/chef/{provider/whyrun_safe_ruby_block.rb → chef_fs/file_system/nonexistent_fs_object.rb} +19 -9
- data/lib/chef/chef_fs/file_system/not_found_error.rb +31 -0
- data/lib/chef/chef_fs/file_system/rest_list_dir.rb +84 -0
- data/lib/chef/chef_fs/file_system/rest_list_entry.rb +123 -0
- data/lib/chef/chef_fs/knife.rb +77 -0
- data/lib/chef/chef_fs/path_utils.rb +64 -0
- data/lib/chef/client.rb +44 -21
- data/lib/chef/config.rb +52 -43
- data/lib/chef/cookbook/synchronizer.rb +6 -8
- data/lib/chef/cookbook/syntax_check.rb +61 -14
- data/lib/chef/cookbook_loader.rb +39 -26
- data/lib/chef/cookbook_uploader.rb +17 -19
- data/lib/chef/cookbook_version.rb +3 -302
- data/lib/chef/daemon.rb +3 -18
- data/lib/chef/data_bag.rb +4 -97
- data/lib/chef/data_bag_item.rb +2 -65
- data/lib/chef/digester.rb +73 -0
- data/lib/chef/dsl.rb +6 -0
- data/lib/chef/dsl/data_query.rb +66 -0
- data/lib/chef/dsl/include_attribute.rb +60 -0
- data/lib/chef/dsl/include_recipe.rb +42 -0
- data/lib/chef/dsl/platform_introspection.rb +213 -0
- data/lib/chef/dsl/recipe.rb +84 -0
- data/lib/chef/dsl/registry_helper.rb +59 -0
- data/lib/chef/encrypted_data_bag_item.rb +74 -19
- data/lib/chef/environment.rb +9 -180
- data/lib/chef/exceptions.rb +87 -14
- data/lib/chef/formatters/base.rb +4 -1
- data/lib/chef/formatters/error_inspectors/registration_error_inspector.rb +0 -4
- data/lib/chef/json_compat.rb +1 -97
- data/lib/chef/knife.rb +90 -41
- data/lib/chef/knife/bootstrap/archlinux-gems.erb +2 -2
- data/lib/chef/knife/bootstrap/centos5-gems.erb +2 -2
- data/lib/chef/knife/bootstrap/chef-full.erb +3 -3
- data/lib/chef/knife/bootstrap/fedora13-gems.erb +2 -2
- data/lib/chef/knife/bootstrap/ubuntu10.04-apt.erb +2 -2
- data/lib/chef/knife/bootstrap/ubuntu10.04-gems.erb +2 -2
- data/lib/chef/knife/bootstrap/ubuntu12.04-gems.erb +2 -2
- data/lib/chef/knife/configure.rb +1 -2
- data/lib/chef/knife/cookbook_metadata.rb +1 -0
- data/lib/chef/knife/cookbook_test.rb +3 -2
- data/lib/chef/knife/cookbook_upload.rb +12 -7
- data/lib/chef/knife/core/bootstrap_context.rb +1 -1
- data/lib/chef/knife/core/generic_presenter.rb +26 -13
- data/lib/chef/knife/core/node_editor.rb +36 -16
- data/lib/chef/knife/core/node_presenter.rb +1 -1
- data/lib/chef/knife/core/text_formatter.rb +23 -37
- data/lib/chef/knife/core/ui.rb +15 -9
- data/lib/chef/knife/delete.rb +39 -0
- data/lib/chef/knife/diff.rb +46 -0
- data/lib/chef/knife/download.rb +50 -0
- data/lib/chef/knife/environment_show.rb +7 -0
- data/lib/chef/knife/exec.rb +5 -5
- data/lib/chef/knife/help_topics.rb +1 -1
- data/lib/chef/knife/index_rebuild.rb +91 -7
- data/lib/chef/knife/list.rb +109 -0
- data/lib/chef/knife/raw.rb +108 -0
- data/lib/chef/knife/search.rb +40 -22
- data/lib/chef/knife/show.rb +32 -0
- data/lib/chef/knife/ssh.rb +6 -2
- data/lib/chef/knife/upload.rb +50 -0
- data/lib/chef/mixin/checksum.rb +3 -3
- data/lib/chef/mixin/deep_merge.rb +55 -197
- data/lib/chef/mixin/language.rb +9 -222
- data/lib/chef/mixin/language_include_attribute.rb +6 -38
- data/lib/chef/mixin/language_include_recipe.rb +3 -35
- data/lib/chef/mixin/params_validate.rb +6 -19
- data/lib/chef/mixin/recipe_definition_dsl_core.rb +8 -61
- data/lib/chef/mixin/securable.rb +32 -7
- data/lib/chef/mixin/template.rb +40 -0
- data/lib/chef/mixins.rb +0 -4
- data/lib/chef/monkey_patches/net_http.rb +0 -34
- data/lib/chef/node.rb +133 -309
- data/lib/chef/node/attribute.rb +333 -473
- data/lib/chef/node/attribute_collections.rb +199 -0
- data/lib/chef/node/immutable_collections.rb +186 -0
- data/lib/chef/platform.rb +7 -22
- data/lib/chef/provider.rb +2 -49
- data/lib/chef/provider/breakpoint.rb +6 -6
- data/lib/chef/provider/cookbook_file.rb +5 -33
- data/lib/chef/provider/deploy.rb +2 -1
- data/lib/chef/provider/directory.rb +14 -17
- data/lib/chef/provider/file.rb +19 -52
- data/lib/chef/provider/group.rb +31 -51
- data/lib/chef/provider/group/dscl.rb +13 -53
- data/lib/chef/provider/group/gpasswd.rb +19 -14
- data/lib/chef/provider/group/groupadd.rb +1 -41
- data/lib/chef/provider/group/groupmod.rb +36 -46
- data/lib/chef/provider/group/pw.rb +16 -59
- data/lib/chef/provider/group/suse.rb +13 -16
- data/lib/chef/provider/group/usermod.rb +18 -40
- data/lib/chef/provider/group/windows.rb +6 -13
- data/lib/chef/provider/http_request.rb +25 -42
- data/lib/chef/provider/link.rb +2 -0
- data/lib/chef/provider/lwrp_base.rb +150 -0
- data/lib/chef/provider/package/portage.rb +4 -9
- data/lib/chef/provider/package/rpm.rb +2 -2
- data/lib/chef/provider/package/rubygems.rb +9 -41
- data/lib/chef/provider/package/yum.rb +12 -19
- data/lib/chef/provider/registry_key.rb +156 -0
- data/lib/chef/provider/remote_directory.rb +2 -0
- data/lib/chef/provider/remote_file.rb +21 -12
- data/lib/chef/provider/ruby_block.rb +5 -2
- data/lib/chef/provider/service.rb +15 -0
- data/lib/chef/provider/service/init.rb +9 -7
- data/lib/chef/provider/service/macosx.rb +15 -73
- data/lib/chef/provider/service/simple.rb +1 -1
- data/lib/chef/provider/service/solaris.rb +3 -3
- data/lib/chef/provider/template.rb +22 -25
- data/lib/chef/provider/template_finder.rb +61 -0
- data/lib/chef/provider/user.rb +0 -1
- data/lib/chef/provider/user/dscl.rb +175 -568
- data/lib/chef/provider/user/useradd.rb +30 -47
- data/lib/chef/providers.rb +3 -2
- data/lib/chef/recipe.rb +14 -8
- data/lib/chef/resource.rb +13 -154
- data/lib/chef/resource/group.rb +1 -11
- data/lib/chef/resource/http_request.rb +2 -1
- data/lib/chef/resource/lwrp_base.rb +127 -0
- data/lib/chef/resource/mount.rb +10 -11
- data/lib/chef/resource/registry_key.rb +86 -0
- data/lib/chef/resource/remote_directory.rb +6 -5
- data/lib/chef/resource/remote_file.rb +22 -31
- data/lib/chef/resource/ruby_block.rb +2 -2
- data/lib/chef/resource/service.rb +14 -0
- data/lib/chef/resource/user.rb +0 -18
- data/lib/chef/resource_collection.rb +25 -21
- data/lib/chef/resources.rb +2 -1
- data/lib/chef/rest.rb +50 -131
- data/lib/chef/rest/auth_credentials.rb +4 -20
- data/lib/chef/rest/rest_request.rb +2 -7
- data/lib/chef/role.rb +1 -97
- data/lib/chef/run_context.rb +108 -130
- data/lib/chef/run_context/cookbook_compiler.rb +280 -0
- data/lib/chef/run_list.rb +0 -2
- data/lib/chef/run_list/run_list_expansion.rb +0 -15
- data/lib/chef/run_lock.rb +90 -0
- data/lib/chef/runner.rb +28 -5
- data/lib/chef/sandbox.rb +15 -148
- data/lib/chef/scan_access_control.rb +2 -4
- data/lib/chef/shef/ext.rb +3 -575
- data/lib/chef/{shef.rb → shell.rb} +35 -40
- data/lib/chef/shell/ext.rb +593 -0
- data/lib/chef/{shef → shell}/model_wrapper.rb +3 -3
- data/lib/chef/{shef/shef_rest.rb → shell/shell_rest.rb} +4 -4
- data/lib/chef/{shef/shef_session.rb → shell/shell_session.rb} +17 -15
- data/lib/chef/shell_out.rb +7 -0
- data/lib/chef/util/windows/net_group.rb +1 -5
- data/lib/chef/version.rb +3 -3
- data/lib/chef/win32/api/process.rb +0 -1
- data/lib/chef/win32/handle.rb +1 -8
- data/lib/chef/win32/registry.rb +371 -0
- data/spec/data/big_json.json +1 -2
- data/spec/data/big_json_plus_one.json +1 -2
- data/spec/data/cookbooks/openldap/attributes/default.rb +10 -9
- data/spec/data/cookbooks/openldap/attributes/smokey.rb +1 -1
- data/spec/data/lwrp/providers/inline_compiler.rb +26 -0
- data/spec/data/nodes/default.rb +3 -3
- data/spec/data/nodes/test.example.com.rb +3 -3
- data/spec/data/nodes/test.rb +3 -3
- data/spec/data/partial_one.erb +1 -0
- data/spec/data/run_context/cookbooks/circular-dep1/attributes/default.rb +4 -0
- data/spec/data/run_context/cookbooks/circular-dep1/definitions/circular_dep1_res.rb +1 -0
- data/spec/data/run_context/cookbooks/circular-dep1/libraries/lib.rb +2 -0
- data/spec/data/run_context/cookbooks/circular-dep1/metadata.rb +2 -0
- data/spec/data/run_context/cookbooks/circular-dep1/providers/provider.rb +1 -0
- data/spec/data/{knife-home/.chef/plugins/knife/example_home_subcommand.rb → run_context/cookbooks/circular-dep1/recipes/default.rb} +0 -0
- data/spec/data/run_context/cookbooks/circular-dep1/resources/resource.rb +1 -0
- data/spec/data/run_context/cookbooks/circular-dep2/attributes/default.rb +3 -0
- data/spec/data/run_context/cookbooks/circular-dep2/definitions/circular_dep2_res.rb +1 -0
- data/spec/data/run_context/cookbooks/circular-dep2/libraries/lib.rb +2 -0
- data/spec/data/run_context/cookbooks/circular-dep2/metadata.rb +2 -0
- data/spec/data/run_context/cookbooks/circular-dep2/providers/provider.rb +1 -0
- data/spec/data/{lwrp_const_scoping/resources/conflict.rb → run_context/cookbooks/circular-dep2/recipes/default.rb} +0 -0
- data/spec/data/run_context/cookbooks/circular-dep2/resources/resource.rb +1 -0
- data/spec/data/run_context/cookbooks/dependency1/attributes/aa_first.rb +2 -0
- data/spec/data/run_context/cookbooks/dependency1/attributes/default.rb +2 -0
- data/spec/data/run_context/cookbooks/dependency1/attributes/zz_last.rb +3 -0
- data/spec/data/run_context/cookbooks/dependency1/definitions/dependency1_res.rb +1 -0
- data/spec/data/run_context/cookbooks/dependency1/libraries/lib.rb +2 -0
- data/spec/data/run_context/cookbooks/dependency1/providers/provider.rb +1 -0
- data/spec/data/run_context/cookbooks/dependency1/recipes/default.rb +0 -0
- data/spec/data/run_context/cookbooks/dependency1/resources/resource.rb +1 -0
- data/spec/data/run_context/cookbooks/dependency2/attributes/default.rb +3 -0
- data/spec/data/run_context/cookbooks/dependency2/definitions/dependency2_res.rb +1 -0
- data/spec/data/run_context/cookbooks/dependency2/libraries/lib.rb +2 -0
- data/spec/data/run_context/cookbooks/dependency2/providers/provider.rb +1 -0
- data/spec/data/run_context/cookbooks/dependency2/recipes/default.rb +0 -0
- data/spec/data/run_context/cookbooks/dependency2/resources/resource.rb +1 -0
- data/spec/data/run_context/cookbooks/no-default-attr/attributes/server.rb +3 -0
- data/spec/data/run_context/cookbooks/no-default-attr/definitions/no_default-attr_res.rb +1 -0
- data/spec/data/run_context/cookbooks/no-default-attr/providers/provider.rb +1 -0
- data/spec/data/run_context/cookbooks/no-default-attr/recipes/default.rb +0 -0
- data/spec/data/run_context/cookbooks/no-default-attr/resources/resource.rb +1 -0
- data/spec/data/run_context/cookbooks/test-with-circular-deps/attributes/default.rb +3 -0
- data/spec/data/run_context/cookbooks/test-with-circular-deps/definitions/test_with-circular-deps_res.rb +1 -0
- data/spec/data/run_context/cookbooks/test-with-circular-deps/libraries/lib.rb +2 -0
- data/spec/data/run_context/cookbooks/test-with-circular-deps/metadata.rb +2 -0
- data/spec/data/run_context/cookbooks/test-with-circular-deps/providers/provider.rb +1 -0
- data/spec/data/run_context/cookbooks/test-with-circular-deps/recipes/default.rb +0 -0
- data/spec/data/run_context/cookbooks/test-with-circular-deps/resources/resource.rb +1 -0
- data/spec/data/run_context/cookbooks/test-with-deps/attributes/default.rb +3 -0
- data/spec/data/run_context/cookbooks/test-with-deps/definitions/test_with-deps_res.rb +1 -0
- data/spec/data/run_context/cookbooks/test-with-deps/libraries/lib.rb +1 -0
- data/spec/data/run_context/cookbooks/test-with-deps/metadata.rb +3 -0
- data/spec/data/run_context/cookbooks/test-with-deps/providers/provider.rb +1 -0
- data/spec/data/run_context/cookbooks/test-with-deps/recipes/default.rb +0 -0
- data/spec/data/run_context/cookbooks/test-with-deps/recipes/server.rb +0 -0
- data/spec/data/run_context/cookbooks/test-with-deps/resources/resource.rb +1 -0
- data/spec/data/run_context/cookbooks/test/attributes/default.rb +0 -0
- data/spec/data/run_context/cookbooks/test/attributes/george.rb +1 -1
- data/spec/data/run_context/cookbooks/test/definitions/test_res.rb +1 -0
- data/spec/data/run_context/cookbooks/test/providers/provider.rb +1 -0
- data/spec/data/run_context/cookbooks/test/resources/resource.rb +1 -0
- data/spec/data/shef-config.rb +7 -0
- data/spec/functional/dsl/registry_helper_spec.rb +63 -0
- data/spec/functional/knife/cookbook_delete_spec.rb +1 -1
- data/spec/functional/knife/exec_spec.rb +2 -2
- data/spec/functional/knife/ssh_spec.rb +5 -1
- data/spec/functional/resource/cookbook_file_spec.rb +7 -19
- data/spec/functional/resource/directory_spec.rb +4 -0
- data/spec/functional/resource/file_spec.rb +56 -22
- data/spec/functional/resource/link_spec.rb +2 -0
- data/spec/functional/resource/registry_spec.rb +576 -0
- data/spec/functional/resource/remote_directory_spec.rb +142 -36
- data/spec/functional/resource/remote_file_spec.rb +18 -0
- data/spec/functional/resource/template_spec.rb +23 -2
- data/spec/functional/run_lock_spec.rb +106 -0
- data/spec/functional/shell_spec.rb +100 -0
- data/spec/functional/win32/registry_helper_spec.rb +632 -0
- data/spec/spec_helper.rb +5 -29
- data/spec/stress/win32/security_spec.rb +1 -1
- data/spec/support/chef_helpers.rb +0 -2
- data/spec/support/platform_helpers.rb +8 -15
- data/spec/support/shared/functional/directory_resource.rb +84 -22
- data/spec/support/shared/functional/file_resource.rb +169 -71
- data/spec/support/shared/functional/securable_resource.rb +143 -119
- data/spec/support/shared/functional/securable_resource_with_reporting.rb +375 -0
- data/spec/support/shared/unit/file_system_support.rb +110 -0
- data/spec/support/shared/unit/platform_introspector.rb +162 -0
- data/spec/unit/api_client/registration_spec.rb +175 -0
- data/spec/unit/api_client_spec.rb +78 -156
- data/spec/unit/application/apply.rb +84 -0
- data/spec/unit/application/client_spec.rb +1 -37
- data/spec/unit/application/knife_spec.rb +5 -0
- data/spec/unit/application_spec.rb +57 -2
- data/spec/unit/checksum/storage/filesystem_spec.rb +1 -1
- data/spec/unit/chef_fs/diff_spec.rb +328 -0
- data/spec/unit/chef_fs/file_pattern_spec.rb +526 -0
- data/spec/unit/chef_fs/file_system/chef_server_root_dir_spec.rb +237 -0
- data/spec/unit/chef_fs/file_system/cookbooks_dir_spec.rb +568 -0
- data/spec/unit/chef_fs/file_system/data_bags_dir_spec.rb +220 -0
- data/spec/unit/chef_fs/file_system_spec.rb +136 -0
- data/spec/unit/client_spec.rb +124 -33
- data/spec/unit/config_spec.rb +46 -13
- data/spec/unit/cookbook/synchronizer_spec.rb +1 -49
- data/spec/unit/cookbook/syntax_check_spec.rb +48 -109
- data/spec/unit/cookbook_loader_spec.rb +153 -91
- data/spec/unit/cookbook_manifest_spec.rb +81 -81
- data/spec/unit/cookbook_spec.rb +3 -20
- data/spec/unit/cookbook_version_spec.rb +23 -122
- data/spec/unit/daemon_spec.rb +3 -24
- data/spec/unit/data_bag_spec.rb +6 -4
- data/spec/unit/digester_spec.rb +50 -0
- data/spec/unit/dsl/data_query_spec.rb +66 -0
- data/spec/unit/dsl/platform_introspection_spec.rb +130 -0
- data/spec/unit/dsl/regsitry_helper_spec.rb +55 -0
- data/spec/unit/encrypted_data_bag_item_spec.rb +50 -105
- data/spec/unit/environment_spec.rb +0 -130
- data/spec/unit/exceptions_spec.rb +2 -3
- data/spec/unit/formatters/error_inspectors/resource_failure_inspector_spec.rb +3 -3
- data/spec/unit/json_compat_spec.rb +15 -7
- data/spec/unit/knife/bootstrap_spec.rb +2 -0
- data/spec/unit/knife/configure_spec.rb +20 -14
- data/spec/unit/knife/cookbook_metadata_spec.rb +11 -4
- data/spec/unit/knife/cookbook_test_spec.rb +1 -0
- data/spec/unit/knife/cookbook_upload_spec.rb +43 -8
- data/spec/unit/knife/core/bootstrap_context_spec.rb +1 -1
- data/spec/unit/knife/core/ui_spec.rb +156 -125
- data/spec/unit/knife/data_bag_create_spec.rb +9 -0
- data/spec/unit/knife/data_bag_edit_spec.rb +1 -4
- data/spec/unit/knife/data_bag_from_file_spec.rb +4 -6
- data/spec/unit/knife/data_bag_show_spec.rb +11 -4
- data/spec/unit/knife/index_rebuild_spec.rb +96 -33
- data/spec/unit/knife/knife_help.rb +7 -7
- data/spec/unit/knife/node_edit_spec.rb +6 -33
- data/spec/unit/knife/node_run_list_remove_spec.rb +2 -1
- data/spec/unit/knife/ssh_spec.rb +12 -15
- data/spec/unit/knife/status_spec.rb +2 -2
- data/spec/unit/knife_spec.rb +53 -0
- data/spec/unit/lwrp_spec.rb +59 -42
- data/spec/unit/mixin/checksum_spec.rb +2 -2
- data/spec/unit/mixin/deep_merge_spec.rb +101 -799
- data/spec/unit/mixin/enforce_ownership_and_permissions_spec.rb +6 -1
- data/spec/unit/mixin/params_validate_spec.rb +4 -37
- data/spec/unit/mixin/securable_spec.rb +5 -3
- data/spec/unit/mixin/template_spec.rb +119 -0
- data/spec/unit/node/attribute_spec.rb +195 -173
- data/spec/unit/node/immutable_collections_spec.rb +139 -0
- data/spec/unit/node_spec.rb +366 -370
- data/spec/unit/platform_spec.rb +9 -10
- data/spec/unit/provider/breakpoint_spec.rb +8 -8
- data/spec/unit/provider/cookbook_file_spec.rb +4 -8
- data/spec/unit/provider/directory_spec.rb +96 -64
- data/spec/unit/provider/env_spec.rb +2 -2
- data/spec/unit/provider/file_spec.rb +48 -39
- data/spec/unit/provider/group/dscl_spec.rb +0 -36
- data/spec/unit/provider/group/gpasswd_spec.rb +9 -16
- data/spec/unit/provider/group/groupadd_spec.rb +4 -3
- data/spec/unit/provider/group/groupmod_spec.rb +1 -0
- data/spec/unit/provider/group/pw_spec.rb +15 -12
- data/spec/unit/provider/group/usermod_spec.rb +6 -21
- data/spec/unit/provider/group/windows_spec.rb +8 -0
- data/spec/unit/provider/group_spec.rb +6 -28
- data/spec/unit/provider/http_request_spec.rb +28 -69
- data/spec/unit/provider/ifconfig_spec.rb +2 -2
- data/spec/unit/provider/ohai_spec.rb +4 -4
- data/spec/unit/provider/package/apt_spec.rb +0 -1
- data/spec/unit/provider/package/ips_spec.rb +0 -1
- data/spec/unit/provider/package/portage_spec.rb +0 -44
- data/spec/unit/provider/package/rpm_spec.rb +0 -12
- data/spec/unit/provider/package/rubygems_spec.rb +1 -44
- data/spec/unit/provider/package/yum_spec.rb +39 -36
- data/spec/unit/provider/package_spec.rb +7 -5
- data/spec/unit/provider/registry_key_spec.rb +269 -0
- data/spec/unit/provider/remote_directory_spec.rb +7 -3
- data/spec/unit/provider/remote_file_spec.rb +36 -0
- data/spec/unit/provider/route_spec.rb +4 -3
- data/spec/unit/provider/ruby_block_spec.rb +8 -0
- data/spec/unit/provider/service/arch_service_spec.rb +5 -5
- data/spec/unit/provider/service/debian_service_spec.rb +1 -1
- data/spec/unit/provider/service/freebsd_service_spec.rb +5 -5
- data/spec/unit/provider/service/init_service_spec.rb +27 -4
- data/spec/unit/provider/service/insserv_service_spec.rb +1 -1
- data/spec/unit/provider/service/invokercd_service_spec.rb +4 -4
- data/spec/unit/provider/service/macosx_spec.rb +11 -66
- data/spec/unit/provider/service/redhat_spec.rb +1 -1
- data/spec/unit/provider/service/simple_service_spec.rb +3 -3
- data/spec/unit/provider/service/upstart_service_spec.rb +9 -9
- data/spec/unit/provider/subversion_spec.rb +1 -1
- data/spec/unit/provider/template_spec.rb +35 -11
- data/spec/unit/provider/user/dscl_spec.rb +285 -681
- data/spec/unit/provider/user/useradd_spec.rb +1 -22
- data/spec/unit/provider/user_spec.rb +1 -1
- data/spec/unit/recipe_spec.rb +10 -8
- data/spec/unit/registry_helper_spec.rb +374 -0
- data/spec/unit/resource/mount_spec.rb +0 -11
- data/spec/unit/resource/registry_key_spec.rb +171 -0
- data/spec/unit/resource/remote_file_spec.rb +21 -23
- data/spec/unit/resource/ruby_block_spec.rb +7 -3
- data/spec/unit/resource/service_spec.rb +11 -0
- data/spec/unit/resource_spec.rb +4 -19
- data/spec/unit/rest/auth_credentials_spec.rb +2 -19
- data/spec/unit/rest_spec.rb +130 -284
- data/spec/unit/run_context/cookbook_compiler_spec.rb +181 -0
- data/spec/unit/run_context_spec.rb +18 -4
- data/spec/unit/run_list_spec.rb +0 -209
- data/spec/unit/run_lock_spec.rb +37 -0
- data/spec/unit/runner_spec.rb +101 -2
- data/spec/unit/scan_access_control_spec.rb +4 -4
- data/spec/unit/{shef → shell}/model_wrapper_spec.rb +5 -5
- data/spec/unit/{shef/shef_ext_spec.rb → shell/shell_ext_spec.rb} +21 -21
- data/spec/unit/{shef/shef_session_spec.rb → shell/shell_session_spec.rb} +14 -69
- data/spec/unit/shell_out_spec.rb +18 -0
- data/spec/unit/{shef_spec.rb → shell_spec.rb} +20 -20
- metadata +275 -234
- checksums.yaml +0 -15
- data/README.rdoc +0 -177
- data/distro/common/html/knife-recipe.1.html +0 -92
- data/lib/chef/certificate.rb +0 -161
- data/lib/chef/checksum.rb +0 -167
- data/lib/chef/checksum_cache.rb +0 -190
- data/lib/chef/cookbook_version_selector.rb +0 -168
- data/lib/chef/couchdb.rb +0 -246
- data/lib/chef/index_queue/amqp_client.rb +0 -116
- data/lib/chef/index_queue/consumer.rb +0 -76
- data/lib/chef/index_queue/indexable.rb +0 -109
- data/lib/chef/knife/bootstrap/ubuntu12.10-gems.erb +0 -60
- data/lib/chef/monkey_patches/moneta.rb +0 -50
- data/lib/chef/monkey_patches/uri.rb +0 -70
- data/lib/chef/openid_registration.rb +0 -187
- data/lib/chef/provider/user/solaris.rb +0 -90
- data/lib/chef/solr_query.rb +0 -187
- data/lib/chef/solr_query/lucene.treetop +0 -150
- data/lib/chef/solr_query/lucene_nodes.rb +0 -285
- data/lib/chef/solr_query/query_transform.rb +0 -65
- data/lib/chef/solr_query/solr_http_request.rb +0 -132
- data/lib/chef/webui_user.rb +0 -231
- data/spec/data/cookbooks/openldap/files/default/.dotfile +0 -1
- data/spec/data/cookbooks/openldap/files/default/.ssh/id_rsa +0 -1
- data/spec/data/cookbooks/openldap/files/default/remotedir/.a_dotdir/.a_dotfile_in_a_dotdir +0 -1
- data/spec/data/cookbooks/openldap/files/default/remotedir/remotesubdir/.a_dotfile +0 -1
- data/spec/data/mac_users/10.7-8.plist.xml +0 -559
- data/spec/data/mac_users/10.7-8.shadow.xml +0 -11
- data/spec/data/mac_users/10.7.plist.xml +0 -559
- data/spec/data/mac_users/10.7.shadow.xml +0 -11
- data/spec/data/mac_users/10.8.plist.xml +0 -559
- data/spec/data/mac_users/10.8.shadow.xml +0 -21
- data/spec/data/mac_users/10.9.plist.xml +0 -560
- data/spec/data/mac_users/10.9.shadow.xml +0 -21
- data/spec/functional/resource/base.rb +0 -40
- data/spec/functional/resource/group_spec.rb +0 -343
- data/spec/functional/resource/user/dscl_spec.rb +0 -199
- data/spec/unit/certificate_spec.rb +0 -76
- data/spec/unit/checksum_cache_spec.rb +0 -209
- data/spec/unit/checksum_spec.rb +0 -94
- data/spec/unit/couchdb_spec.rb +0 -274
- data/spec/unit/index_queue_spec.rb +0 -391
- data/spec/unit/mixin/language_spec.rb +0 -305
- data/spec/unit/openid_registration_spec.rb +0 -153
- data/spec/unit/provider/user/solaris_spec.rb +0 -414
- data/spec/unit/provider/whyrun_safe_ruby_block_spec.rb +0 -47
- data/spec/unit/solr_query/query_transform_spec.rb +0 -454
- data/spec/unit/solr_query/solr_http_request_spec.rb +0 -244
- data/spec/unit/solr_query_spec.rb +0 -203
- data/spec/unit/webui_user_spec.rb +0 -238
@@ -1,187 +0,0 @@
|
|
1
|
-
#
|
2
|
-
# Author:: Adam Jacob (<adam@opscode.com>)
|
3
|
-
# Copyright:: Copyright (c) 2008 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/config'
|
20
|
-
require 'chef/mixin/params_validate'
|
21
|
-
require 'chef/couchdb'
|
22
|
-
require 'chef/index_queue'
|
23
|
-
require 'digest/sha1'
|
24
|
-
require 'chef/json_compat'
|
25
|
-
|
26
|
-
class Chef
|
27
|
-
class OpenIDRegistration
|
28
|
-
|
29
|
-
attr_accessor :name, :salt, :validated, :password, :couchdb_rev, :admin
|
30
|
-
|
31
|
-
include Chef::Mixin::ParamsValidate
|
32
|
-
include Chef::IndexQueue::Indexable
|
33
|
-
|
34
|
-
DESIGN_DOCUMENT = {
|
35
|
-
"version" => 3,
|
36
|
-
"language" => "javascript",
|
37
|
-
"views" => {
|
38
|
-
"all" => {
|
39
|
-
"map" => <<-EOJS
|
40
|
-
function(doc) {
|
41
|
-
if (doc.chef_type == "openid_registration") {
|
42
|
-
emit(doc.name, doc);
|
43
|
-
}
|
44
|
-
}
|
45
|
-
EOJS
|
46
|
-
},
|
47
|
-
"all_id" => {
|
48
|
-
"map" => <<-EOJS
|
49
|
-
function(doc) {
|
50
|
-
if (doc.chef_type == "openid_registration") {
|
51
|
-
emit(doc.name, doc.name);
|
52
|
-
}
|
53
|
-
}
|
54
|
-
EOJS
|
55
|
-
},
|
56
|
-
"validated" => {
|
57
|
-
"map" => <<-EOJS
|
58
|
-
function(doc) {
|
59
|
-
if (doc.chef_type == "openid_registration") {
|
60
|
-
if (doc.validated == true) {
|
61
|
-
emit(doc.name, doc);
|
62
|
-
}
|
63
|
-
}
|
64
|
-
}
|
65
|
-
EOJS
|
66
|
-
},
|
67
|
-
"unvalidated" => {
|
68
|
-
"map" => <<-EOJS
|
69
|
-
function(doc) {
|
70
|
-
if (doc.chef_type == "openid_registration") {
|
71
|
-
if (doc.validated == false) {
|
72
|
-
emit(doc.name, doc);
|
73
|
-
}
|
74
|
-
}
|
75
|
-
}
|
76
|
-
EOJS
|
77
|
-
},
|
78
|
-
},
|
79
|
-
}
|
80
|
-
|
81
|
-
# Create a new Chef::OpenIDRegistration object.
|
82
|
-
def initialize()
|
83
|
-
@name = nil
|
84
|
-
@salt = nil
|
85
|
-
@password = nil
|
86
|
-
@validated = false
|
87
|
-
@admin = false
|
88
|
-
@couchdb_rev = nil
|
89
|
-
@couchdb = Chef::CouchDB.new
|
90
|
-
end
|
91
|
-
|
92
|
-
def name=(n)
|
93
|
-
@name = n.gsub(/\./, '_')
|
94
|
-
end
|
95
|
-
|
96
|
-
# Set the password for this object.
|
97
|
-
def set_password(password)
|
98
|
-
@salt = generate_salt
|
99
|
-
@password = encrypt_password(@salt, password)
|
100
|
-
end
|
101
|
-
|
102
|
-
# Serialize this object as a hash
|
103
|
-
def to_json(*a)
|
104
|
-
attributes = Hash.new
|
105
|
-
recipes = Array.new
|
106
|
-
result = {
|
107
|
-
'name' => @name,
|
108
|
-
'json_class' => self.class.name,
|
109
|
-
'salt' => @salt,
|
110
|
-
'password' => @password,
|
111
|
-
'validated' => @validated,
|
112
|
-
'admin' => @admin,
|
113
|
-
'chef_type' => 'openid_registration',
|
114
|
-
}
|
115
|
-
result["_rev"] = @couchdb_rev if @couchdb_rev
|
116
|
-
result.to_json(*a)
|
117
|
-
end
|
118
|
-
|
119
|
-
# Create a Chef::Node from JSON
|
120
|
-
def self.json_create(o)
|
121
|
-
me = new
|
122
|
-
me.name = o["name"]
|
123
|
-
me.salt = o["salt"]
|
124
|
-
me.password = o["password"]
|
125
|
-
me.validated = o["validated"]
|
126
|
-
me.admin = o["admin"]
|
127
|
-
me.couchdb_rev = o["_rev"] if o.has_key?("_rev")
|
128
|
-
me
|
129
|
-
end
|
130
|
-
|
131
|
-
# List all the Chef::OpenIDRegistration objects in the CouchDB. If inflate is set to true, you will get
|
132
|
-
# the full list of all registration objects. Otherwise, you'll just get the IDs
|
133
|
-
def self.list(inflate=false)
|
134
|
-
rs = Chef::CouchDB.new.list("registrations", inflate)
|
135
|
-
if inflate
|
136
|
-
rs["rows"].collect { |r| r["value"] }
|
137
|
-
else
|
138
|
-
rs["rows"].collect { |r| r["key"] }
|
139
|
-
end
|
140
|
-
end
|
141
|
-
|
142
|
-
def self.cdb_list(*args)
|
143
|
-
list(*args)
|
144
|
-
end
|
145
|
-
|
146
|
-
# Load an OpenIDRegistration by name from CouchDB
|
147
|
-
def self.load(name)
|
148
|
-
Chef::CouchDB.new.load("openid_registration", name)
|
149
|
-
end
|
150
|
-
|
151
|
-
# Whether or not there is an OpenID Registration with this key.
|
152
|
-
def self.has_key?(name)
|
153
|
-
Chef::CouchDB.new.has_key?("openid_registration", name)
|
154
|
-
end
|
155
|
-
|
156
|
-
# Remove this OpenIDRegistration from the CouchDB
|
157
|
-
def destroy
|
158
|
-
@couchdb.delete("openid_registration", @name, @couchdb_rev)
|
159
|
-
end
|
160
|
-
|
161
|
-
# Save this OpenIDRegistration to the CouchDB
|
162
|
-
def save
|
163
|
-
results = @couchdb.store("openid_registration", @name, self)
|
164
|
-
@couchdb_rev = results["rev"]
|
165
|
-
end
|
166
|
-
|
167
|
-
# Set up our CouchDB design document
|
168
|
-
def self.create_design_document(couchdb=nil)
|
169
|
-
couchdb ||= Chef::CouchDB.new
|
170
|
-
couchdb.create_design_document("registrations", DESIGN_DOCUMENT)
|
171
|
-
end
|
172
|
-
|
173
|
-
protected
|
174
|
-
|
175
|
-
def generate_salt
|
176
|
-
salt = Time.now.to_s
|
177
|
-
chars = ("a".."z").to_a + ("A".."Z").to_a + ("0".."9").to_a
|
178
|
-
1.upto(30) { |i| salt << chars[rand(chars.size-1)] }
|
179
|
-
salt
|
180
|
-
end
|
181
|
-
|
182
|
-
def encrypt_password(salt, password)
|
183
|
-
Digest::SHA1.hexdigest("--#{salt}--#{password}--")
|
184
|
-
end
|
185
|
-
|
186
|
-
end
|
187
|
-
end
|
@@ -1,90 +0,0 @@
|
|
1
|
-
#
|
2
|
-
# Author:: Stephen Nelson-Smith (<sns@opscode.com>)
|
3
|
-
# Author:: Jon Ramsey (<jonathon.ramsey@gmail.com>)
|
4
|
-
# Copyright:: Copyright (c) 2012 Opscode, Inc.
|
5
|
-
# License:: Apache License, Version 2.0
|
6
|
-
#
|
7
|
-
# Licensed under the Apache License, Version 2.0 (the "License");
|
8
|
-
# you may not use this file except in compliance with the License.
|
9
|
-
# You may obtain a copy of the License at
|
10
|
-
#
|
11
|
-
# http://www.apache.org/licenses/LICENSE-2.0
|
12
|
-
#
|
13
|
-
# Unless required by applicable law or agreed to in writing, software
|
14
|
-
# distributed under the License is distributed on an "AS IS" BASIS,
|
15
|
-
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
16
|
-
# See the License for the specific language governing permissions and
|
17
|
-
# limitations under the License.
|
18
|
-
|
19
|
-
class Chef
|
20
|
-
class Provider
|
21
|
-
class User
|
22
|
-
class Solaris < Chef::Provider::User::Useradd
|
23
|
-
UNIVERSAL_OPTIONS = [[:comment, "-c"], [:gid, "-g"], [:shell, "-s"], [:uid, "-u"]]
|
24
|
-
|
25
|
-
attr_writer :password_file
|
26
|
-
|
27
|
-
def initialize(new_resource, run_context)
|
28
|
-
@password_file = "/etc/shadow"
|
29
|
-
super
|
30
|
-
end
|
31
|
-
|
32
|
-
def create_user
|
33
|
-
super
|
34
|
-
manage_password
|
35
|
-
end
|
36
|
-
|
37
|
-
def manage_user
|
38
|
-
manage_password
|
39
|
-
super
|
40
|
-
end
|
41
|
-
|
42
|
-
private
|
43
|
-
|
44
|
-
def manage_password
|
45
|
-
if @current_resource.password != @new_resource.password && @new_resource.password
|
46
|
-
Chef::Log.debug("#{@new_resource} setting password to #{@new_resource.password}")
|
47
|
-
write_shadow_file
|
48
|
-
end
|
49
|
-
end
|
50
|
-
|
51
|
-
def write_shadow_file
|
52
|
-
buffer = Tempfile.new("shadow", "/etc")
|
53
|
-
::File.open(@password_file) do |shadow_file|
|
54
|
-
shadow_file.each do |entry|
|
55
|
-
user = entry.split(":").first
|
56
|
-
if user == @new_resource.username
|
57
|
-
buffer.write(updated_password(entry))
|
58
|
-
else
|
59
|
-
buffer.write(entry)
|
60
|
-
end
|
61
|
-
end
|
62
|
-
end
|
63
|
-
buffer.close
|
64
|
-
|
65
|
-
# FIXME: mostly duplicates code with file provider deploying a file
|
66
|
-
mode = ::File.stat(@password_file).mode & 07777
|
67
|
-
uid = ::File.stat(@password_file).uid
|
68
|
-
gid = ::File.stat(@password_file).gid
|
69
|
-
|
70
|
-
FileUtils.chown uid, gid, buffer.path
|
71
|
-
FileUtils.chmod mode, buffer.path
|
72
|
-
|
73
|
-
FileUtils.mv buffer.path, @password_file
|
74
|
-
end
|
75
|
-
|
76
|
-
def updated_password(entry)
|
77
|
-
fields = entry.split(":")
|
78
|
-
fields[1] = @new_resource.password
|
79
|
-
fields[2] = days_since_epoch
|
80
|
-
fields.join(":")
|
81
|
-
end
|
82
|
-
|
83
|
-
def days_since_epoch
|
84
|
-
(Time.now.to_i / 86400).floor
|
85
|
-
end
|
86
|
-
end
|
87
|
-
end
|
88
|
-
end
|
89
|
-
end
|
90
|
-
|
data/lib/chef/solr_query.rb
DELETED
@@ -1,187 +0,0 @@
|
|
1
|
-
#
|
2
|
-
# Author:: Adam Jacob (<adam@opscode.com>)
|
3
|
-
# Author:: Daniel DeLeo (<dan@opscode.com>)
|
4
|
-
# Author:: Seth Falcon (<seth@opscode.com>)
|
5
|
-
# Copyright:: Copyright (c) 2009-2011 Opscode, 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 'chef/mixin/xml_escape'
|
22
|
-
require 'chef/log'
|
23
|
-
require 'chef/config'
|
24
|
-
require 'chef/couchdb'
|
25
|
-
require 'chef/solr_query/solr_http_request'
|
26
|
-
require 'chef/solr_query/query_transform'
|
27
|
-
|
28
|
-
class Chef
|
29
|
-
class SolrQuery
|
30
|
-
|
31
|
-
ID_KEY = "X_CHEF_id_CHEF_X"
|
32
|
-
DEFAULT_PARAMS = Mash.new(:start => 0, :rows => 1000, :sort => "#{ID_KEY} asc", :wt => 'json', :indent => 'off').freeze
|
33
|
-
FILTER_PARAM_MAP = {:database => 'X_CHEF_database_CHEF_X', :type => "X_CHEF_type_CHEF_X", :data_bag => 'data_bag'}
|
34
|
-
VALID_PARAMS = [:start,:rows,:sort,:q,:type]
|
35
|
-
BUILTIN_SEARCH_TYPES = ["role","node","client","environment"]
|
36
|
-
DATA_BAG_ITEM = 'data_bag_item'
|
37
|
-
|
38
|
-
include Chef::Mixin::XMLEscape
|
39
|
-
|
40
|
-
attr_accessor :query
|
41
|
-
attr_accessor :params
|
42
|
-
|
43
|
-
# Create a new Query object - takes the solr_url and optional
|
44
|
-
# Chef::CouchDB object to inflate objects into.
|
45
|
-
def initialize(couchdb = nil)
|
46
|
-
@filter_query = {}
|
47
|
-
@params = {}
|
48
|
-
|
49
|
-
if couchdb.nil?
|
50
|
-
@database = Chef::Config[:couchdb_database]
|
51
|
-
@couchdb = Chef::CouchDB.new(nil, Chef::Config[:couchdb_database])
|
52
|
-
else
|
53
|
-
unless couchdb.respond_to?(:couchdb_database)
|
54
|
-
Chef::Log.warn("Passing the database name to Chef::Solr::Query initialization is deprecated. Please pass in the Chef::CouchDB object instead.")
|
55
|
-
@database = couchdb
|
56
|
-
@couchdb = Chef::CouchDB.new(nil, couchdb)
|
57
|
-
else
|
58
|
-
@database = couchdb.couchdb_database
|
59
|
-
@couchdb = couchdb
|
60
|
-
end
|
61
|
-
end
|
62
|
-
end
|
63
|
-
|
64
|
-
def self.from_params(params, couchdb=nil)
|
65
|
-
query = new(couchdb)
|
66
|
-
query.params = VALID_PARAMS.inject({}) do |p, param_name|
|
67
|
-
p[param_name] = params[param_name] if params.key?(param_name)
|
68
|
-
p
|
69
|
-
end
|
70
|
-
query.update_filter_query_from_params
|
71
|
-
query.update_query_from_params
|
72
|
-
query
|
73
|
-
end
|
74
|
-
|
75
|
-
def filter_by(filter_query_params)
|
76
|
-
filter_query_params.each do |key, value|
|
77
|
-
@filter_query[FILTER_PARAM_MAP[key]] = value
|
78
|
-
end
|
79
|
-
end
|
80
|
-
|
81
|
-
def filter_query
|
82
|
-
@filter_query.map { |param, value| "+#{param}:#{value}" }.join(' ')
|
83
|
-
end
|
84
|
-
|
85
|
-
def filter_by_type(type)
|
86
|
-
case type
|
87
|
-
when *BUILTIN_SEARCH_TYPES
|
88
|
-
filter_by(:type => type)
|
89
|
-
else
|
90
|
-
filter_by(:type => DATA_BAG_ITEM, :data_bag => type)
|
91
|
-
end
|
92
|
-
end
|
93
|
-
|
94
|
-
def update_filter_query_from_params
|
95
|
-
filter_by(:database => @database)
|
96
|
-
filter_by_type(params.delete(:type))
|
97
|
-
end
|
98
|
-
|
99
|
-
def update_query_from_params
|
100
|
-
original_query = URI.decode(params.delete(:q) || "*:*")
|
101
|
-
@query = Chef::SolrQuery::QueryTransform.transform(original_query)
|
102
|
-
end
|
103
|
-
|
104
|
-
def objects
|
105
|
-
if !object_ids.empty?
|
106
|
-
@bulk_objects ||= @couchdb.bulk_get(object_ids)
|
107
|
-
Chef::Log.debug { "Bulk get of objects: #{@bulk_objects.inspect}" }
|
108
|
-
@bulk_objects
|
109
|
-
else
|
110
|
-
[]
|
111
|
-
end
|
112
|
-
end
|
113
|
-
|
114
|
-
def object_ids
|
115
|
-
@object_ids ||= results["response"]["docs"].map { |d| d[ID_KEY] }
|
116
|
-
end
|
117
|
-
|
118
|
-
def results
|
119
|
-
@results ||= SolrHTTPRequest.select(self.to_hash)
|
120
|
-
end
|
121
|
-
|
122
|
-
# Search Solr for objects of a given type, for a given query.
|
123
|
-
def search
|
124
|
-
{ "rows" => objects, "start" => results["response"]["start"],
|
125
|
-
"total" => results["response"]["numFound"] }
|
126
|
-
end
|
127
|
-
|
128
|
-
def to_hash
|
129
|
-
options = DEFAULT_PARAMS.merge(params)
|
130
|
-
options[:fq] = filter_query
|
131
|
-
options[:q] = @query
|
132
|
-
options
|
133
|
-
end
|
134
|
-
|
135
|
-
START_XML = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n".freeze
|
136
|
-
START_DELETE_BY_QUERY = "<delete><query>".freeze
|
137
|
-
END_DELETE_BY_QUERY = "</query></delete>\n".freeze
|
138
|
-
COMMIT = "<commit/>\n".freeze
|
139
|
-
|
140
|
-
def commit(opts={})
|
141
|
-
SolrHTTPRequest.update("#{START_XML}#{COMMIT}")
|
142
|
-
end
|
143
|
-
|
144
|
-
def delete_database(db)
|
145
|
-
query_data = xml_escape("X_CHEF_database_CHEF_X:#{db}")
|
146
|
-
xml = "#{START_XML}#{START_DELETE_BY_QUERY}#{query_data}#{END_DELETE_BY_QUERY}"
|
147
|
-
SolrHTTPRequest.update(xml)
|
148
|
-
commit
|
149
|
-
end
|
150
|
-
|
151
|
-
def rebuild_index(db=Chef::Config[:couchdb_database])
|
152
|
-
delete_database(db)
|
153
|
-
|
154
|
-
results = {}
|
155
|
-
[Chef::ApiClient, Chef::Node, Chef::Role, Chef::Environment].each do |klass|
|
156
|
-
results[klass.name] = reindex_all(klass) ? "success" : "failed"
|
157
|
-
end
|
158
|
-
databags = Chef::DataBag.cdb_list(true)
|
159
|
-
Chef::Log.info("Reloading #{databags.size.to_s} #{Chef::DataBag} objects into the indexer")
|
160
|
-
databags.each { |i| i.add_to_index; i.list(true).each { |x| x.add_to_index } }
|
161
|
-
results[Chef::DataBag.name] = "success"
|
162
|
-
results
|
163
|
-
end
|
164
|
-
|
165
|
-
def reindex_all(klass, metadata={})
|
166
|
-
begin
|
167
|
-
items = klass.cdb_list(true)
|
168
|
-
Chef::Log.info("Reloading #{items.size.to_s} #{klass.name} objects into the indexer")
|
169
|
-
items.each { |i| i.add_to_index }
|
170
|
-
rescue Net::HTTPServerException => e
|
171
|
-
# 404s are okay, there might not be any of that kind of object...
|
172
|
-
if e.message =~ /Not Found/
|
173
|
-
Chef::Log.warn("Could not load #{klass.name} objects from couch for re-indexing (this is ok if you don't have any of these)")
|
174
|
-
return false
|
175
|
-
else
|
176
|
-
raise e
|
177
|
-
end
|
178
|
-
rescue Exception => e
|
179
|
-
Chef::Log.fatal("Chef encountered an error while attempting to load #{klass.name} objects back into the index")
|
180
|
-
raise e
|
181
|
-
end
|
182
|
-
true
|
183
|
-
end
|
184
|
-
|
185
|
-
|
186
|
-
end
|
187
|
-
end
|