chef 10.34.6 → 11.0.0.beta.0
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/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,116 +0,0 @@
|
|
|
1
|
-
#
|
|
2
|
-
# Author:: Daniel DeLeo (<dan@kallistec.com>)
|
|
3
|
-
# Copyright:: Copyright (c) 2009 Daniel DeLeo
|
|
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
|
-
class Chef
|
|
20
|
-
module IndexQueue
|
|
21
|
-
class AmqpClient
|
|
22
|
-
VNODES = 1024
|
|
23
|
-
|
|
24
|
-
include Singleton
|
|
25
|
-
|
|
26
|
-
def initialize
|
|
27
|
-
reset!
|
|
28
|
-
end
|
|
29
|
-
|
|
30
|
-
def reset!
|
|
31
|
-
@amqp_client && amqp_client.connected? && amqp_client.stop
|
|
32
|
-
@amqp_client = nil
|
|
33
|
-
@exchange = nil
|
|
34
|
-
end
|
|
35
|
-
|
|
36
|
-
def stop
|
|
37
|
-
@amqp_client && @amqp_client.stop
|
|
38
|
-
end
|
|
39
|
-
|
|
40
|
-
def amqp_client
|
|
41
|
-
unless @amqp_client
|
|
42
|
-
begin
|
|
43
|
-
@amqp_client = Bunny.new(amqp_opts)
|
|
44
|
-
Chef::Log.debug "Starting AMQP connection with client settings: #{@amqp_client.inspect}"
|
|
45
|
-
@amqp_client.start
|
|
46
|
-
@amqp_client.qos(:prefetch_count => 1)
|
|
47
|
-
rescue Bunny::ServerDownError => e
|
|
48
|
-
Chef::Log.fatal "Could not connect to rabbitmq. Is it running, reachable, and configured correctly?"
|
|
49
|
-
raise e
|
|
50
|
-
rescue Bunny::ProtocolError => e
|
|
51
|
-
Chef::Log.fatal "Connection to rabbitmq refused. Check your rabbitmq configuration and chef's amqp* settings"
|
|
52
|
-
raise e
|
|
53
|
-
end
|
|
54
|
-
end
|
|
55
|
-
@amqp_client
|
|
56
|
-
end
|
|
57
|
-
|
|
58
|
-
def exchange
|
|
59
|
-
@exchange ||= amqp_client.exchange("chef-indexer", :durable => true, :type => :fanout)
|
|
60
|
-
end
|
|
61
|
-
|
|
62
|
-
def disconnected!
|
|
63
|
-
Chef::Log.error("Disconnected from the AMQP Broker (RabbitMQ)")
|
|
64
|
-
@amqp_client = nil
|
|
65
|
-
reset!
|
|
66
|
-
end
|
|
67
|
-
|
|
68
|
-
def queue_for_object(obj_id)
|
|
69
|
-
retries = 0
|
|
70
|
-
vnode_tag = obj_id_to_int(obj_id) % VNODES
|
|
71
|
-
begin
|
|
72
|
-
yield amqp_client.queue("vnode-#{vnode_tag}", :passive => false, :durable => true, :exclusive => false, :auto_delete => false)
|
|
73
|
-
rescue Bunny::ServerDownError, Bunny::ConnectionError, Errno::ECONNRESET
|
|
74
|
-
disconnected!
|
|
75
|
-
if (retries += 1) < 2
|
|
76
|
-
Chef::Log.info("Attempting to reconnect to the AMQP broker")
|
|
77
|
-
retry
|
|
78
|
-
else
|
|
79
|
-
Chef::Log.fatal("Could not re-connect to the AMQP broker, giving up")
|
|
80
|
-
raise
|
|
81
|
-
end
|
|
82
|
-
end
|
|
83
|
-
end
|
|
84
|
-
|
|
85
|
-
private
|
|
86
|
-
|
|
87
|
-
# Sometimes object ids are "proper" UUIDs, like "64bc00eb-120b-b6a2-ec0e-34fc90d151be"
|
|
88
|
-
# and sometimes they omit the dashes, like "64bc00eb120bb6a2ec0e34fc90d151be"
|
|
89
|
-
# UUIDTools uses different methods to parse the different styles.
|
|
90
|
-
def obj_id_to_int(obj_id)
|
|
91
|
-
UUIDTools::UUID.parse(obj_id).to_i
|
|
92
|
-
rescue ArgumentError
|
|
93
|
-
UUIDTools::UUID.parse_hexdigest(obj_id).to_i
|
|
94
|
-
end
|
|
95
|
-
|
|
96
|
-
def durable_queue?
|
|
97
|
-
!!Chef::Config[:amqp_consumer_id]
|
|
98
|
-
end
|
|
99
|
-
|
|
100
|
-
def consumer_id
|
|
101
|
-
Chef::Config[:amqp_consumer_id] || UUIDTools::UUID.random_create.to_s
|
|
102
|
-
end
|
|
103
|
-
|
|
104
|
-
def amqp_opts
|
|
105
|
-
{ :spec => '08',
|
|
106
|
-
:host => Chef::Config[:amqp_host],
|
|
107
|
-
:port => Chef::Config[:amqp_port],
|
|
108
|
-
:user => Chef::Config[:amqp_user],
|
|
109
|
-
:pass => Chef::Config[:amqp_pass],
|
|
110
|
-
:vhost => Chef::Config[:amqp_vhost]}
|
|
111
|
-
end
|
|
112
|
-
|
|
113
|
-
end
|
|
114
|
-
end
|
|
115
|
-
end
|
|
116
|
-
|
|
@@ -1,76 +0,0 @@
|
|
|
1
|
-
#
|
|
2
|
-
# Author:: Daniel DeLeo (<dan@kallistec.com>)
|
|
3
|
-
# Copyright:: Copyright (c) 2009 Daniel DeLeo
|
|
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
|
-
class Chef
|
|
20
|
-
module IndexQueue
|
|
21
|
-
module Consumer
|
|
22
|
-
module ClassMethods
|
|
23
|
-
def expose(*methods)
|
|
24
|
-
@exposed_methods = Array(@exposed_methods)
|
|
25
|
-
@exposed_methods += methods
|
|
26
|
-
end
|
|
27
|
-
|
|
28
|
-
def exposed_methods
|
|
29
|
-
@exposed_methods || []
|
|
30
|
-
end
|
|
31
|
-
|
|
32
|
-
def whitelisted?(method_name)
|
|
33
|
-
exposed_methods.include?(method_name)
|
|
34
|
-
end
|
|
35
|
-
end
|
|
36
|
-
|
|
37
|
-
def self.included(including_class)
|
|
38
|
-
including_class.send(:extend, ClassMethods)
|
|
39
|
-
end
|
|
40
|
-
|
|
41
|
-
def run
|
|
42
|
-
Chef::Log.debug("Starting Index Queue Consumer")
|
|
43
|
-
AmqpClient.instance.queue # triggers connection setup
|
|
44
|
-
|
|
45
|
-
begin
|
|
46
|
-
AmqpClient.instance.queue.subscribe(:ack => true, :timeout => false) do |message|
|
|
47
|
-
call_action_for_message(message)
|
|
48
|
-
end
|
|
49
|
-
rescue Bunny::ConnectionError, Errno::ECONNRESET, Bunny::ServerDownError
|
|
50
|
-
AmqpClient.instance.disconnected!
|
|
51
|
-
Chef::Log.warn "Connection to rabbitmq lost. attempting to reconnect"
|
|
52
|
-
sleep 1
|
|
53
|
-
retry
|
|
54
|
-
end
|
|
55
|
-
end
|
|
56
|
-
alias :start :run
|
|
57
|
-
|
|
58
|
-
def call_action_for_message(message)
|
|
59
|
-
amqp_payload = Chef::JSONCompat.from_json(message[:payload], :create_additions => false, :max_nesting => false)
|
|
60
|
-
action = amqp_payload["action"].to_sym
|
|
61
|
-
app_payload = amqp_payload["payload"]
|
|
62
|
-
assert_method_whitelisted(action)
|
|
63
|
-
send(action, app_payload)
|
|
64
|
-
end
|
|
65
|
-
|
|
66
|
-
private
|
|
67
|
-
|
|
68
|
-
def assert_method_whitelisted(method_name)
|
|
69
|
-
unless self.class.whitelisted?(method_name)
|
|
70
|
-
raise ArgumentError, "non-exposed method #{method_name} called via index queue"
|
|
71
|
-
end
|
|
72
|
-
end
|
|
73
|
-
|
|
74
|
-
end
|
|
75
|
-
end
|
|
76
|
-
end
|
|
@@ -1,109 +0,0 @@
|
|
|
1
|
-
#
|
|
2
|
-
# Author:: Daniel DeLeo (<dan@kallistec.com>)
|
|
3
|
-
# Author:: Seth Falcon (<seth@opscode.com>)
|
|
4
|
-
# Copyright:: Copyright (c) 2009 Daniel DeLeo
|
|
5
|
-
# Copyright:: Copyright (c) 2010 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
|
-
require 'chef/json_compat'
|
|
21
|
-
|
|
22
|
-
class Chef
|
|
23
|
-
module IndexQueue
|
|
24
|
-
module Indexable
|
|
25
|
-
|
|
26
|
-
module ClassMethods
|
|
27
|
-
|
|
28
|
-
def index_object_type(explicit_type_name=nil)
|
|
29
|
-
@index_object_type = explicit_type_name.to_s if explicit_type_name
|
|
30
|
-
@index_object_type
|
|
31
|
-
end
|
|
32
|
-
|
|
33
|
-
# Resets all metadata used for indexing to nil. Used for testing
|
|
34
|
-
def reset_index_metadata!
|
|
35
|
-
@index_object_type = nil
|
|
36
|
-
end
|
|
37
|
-
|
|
38
|
-
end
|
|
39
|
-
|
|
40
|
-
def self.included(including_class)
|
|
41
|
-
including_class.send(:extend, ClassMethods)
|
|
42
|
-
end
|
|
43
|
-
|
|
44
|
-
attr_accessor :index_id
|
|
45
|
-
|
|
46
|
-
def index_object_type
|
|
47
|
-
self.class.index_object_type || Mixin::ConvertToClassName.snake_case_basename(self.class.name)
|
|
48
|
-
end
|
|
49
|
-
|
|
50
|
-
def with_indexer_metadata(indexer_metadata={})
|
|
51
|
-
# changing input param symbol keys to strings, as the keys in hash that goes to solr are expected to be strings [cb]
|
|
52
|
-
# Ruby 1.9 hates you, cb [dan]
|
|
53
|
-
with_metadata = {}
|
|
54
|
-
indexer_metadata.each_key do |key|
|
|
55
|
-
with_metadata[key.to_s] = indexer_metadata[key]
|
|
56
|
-
end
|
|
57
|
-
|
|
58
|
-
with_metadata["type"] ||= self.index_object_type
|
|
59
|
-
with_metadata["id"] ||= self.index_id
|
|
60
|
-
with_metadata["database"] ||= Chef::Config[:couchdb_database]
|
|
61
|
-
with_metadata["item"] ||= self.to_hash
|
|
62
|
-
with_metadata["enqueued_at"] ||= Time.now.utc.to_i
|
|
63
|
-
|
|
64
|
-
raise ArgumentError, "Type, Id, or Database missing in index operation: #{with_metadata.inspect}" if (with_metadata["id"].nil? or with_metadata["type"].nil?)
|
|
65
|
-
with_metadata
|
|
66
|
-
end
|
|
67
|
-
|
|
68
|
-
def add_to_index(metadata={})
|
|
69
|
-
Chef::Log.debug("Pushing item to index queue for addition: #{self.with_indexer_metadata(metadata)}")
|
|
70
|
-
object_with_metadata = with_indexer_metadata(metadata)
|
|
71
|
-
obj_id = object_with_metadata["id"]
|
|
72
|
-
obj = {:action => :add, :payload => self.with_indexer_metadata(metadata)}
|
|
73
|
-
|
|
74
|
-
publish_object(obj_id, obj)
|
|
75
|
-
end
|
|
76
|
-
|
|
77
|
-
def delete_from_index(metadata={})
|
|
78
|
-
Chef::Log.debug("Pushing item to index queue for deletion: #{self.with_indexer_metadata(metadata)}")
|
|
79
|
-
object_with_metadata = with_indexer_metadata(metadata)
|
|
80
|
-
obj_id = object_with_metadata["id"]
|
|
81
|
-
obj = {:action => :delete, :payload => self.with_indexer_metadata(metadata)}
|
|
82
|
-
|
|
83
|
-
publish_object(obj_id, obj)
|
|
84
|
-
end
|
|
85
|
-
|
|
86
|
-
private
|
|
87
|
-
|
|
88
|
-
# Uses the publisher to update the object's queue. If
|
|
89
|
-
# Chef::Config[:persistent_queue] is true, the update is wrapped
|
|
90
|
-
# in a transaction.
|
|
91
|
-
def publish_object(object_id, object)
|
|
92
|
-
publisher = AmqpClient.instance
|
|
93
|
-
begin
|
|
94
|
-
publisher.amqp_client.tx_select if Chef::Config[:persistent_queue]
|
|
95
|
-
publisher.queue_for_object(object_id) do |queue|
|
|
96
|
-
queue.publish(Chef::JSONCompat.to_json(object), :persistent => Chef::Config[:persistent_queue])
|
|
97
|
-
end
|
|
98
|
-
publisher.amqp_client.tx_commit if Chef::Config[:persistent_queue]
|
|
99
|
-
rescue
|
|
100
|
-
publisher.amqp_client.tx_rollback if Chef::Config[:persistent_queue]
|
|
101
|
-
raise
|
|
102
|
-
end
|
|
103
|
-
|
|
104
|
-
true
|
|
105
|
-
end
|
|
106
|
-
|
|
107
|
-
end
|
|
108
|
-
end
|
|
109
|
-
end
|
|
@@ -1,60 +0,0 @@
|
|
|
1
|
-
bash -c '
|
|
2
|
-
<%= "export http_proxy=\"#{knife_config[:bootstrap_proxy]}\"" if knife_config[:bootstrap_proxy] -%>
|
|
3
|
-
|
|
4
|
-
if [ ! -f /usr/bin/chef-client ]; then
|
|
5
|
-
aptitude update
|
|
6
|
-
aptitude install -y ruby ruby1.9.1-dev build-essential wget rubygems
|
|
7
|
-
fi
|
|
8
|
-
|
|
9
|
-
gem update --no-rdoc --no-ri
|
|
10
|
-
gem install ohai --no-rdoc --no-ri --verbose
|
|
11
|
-
gem install chef --no-rdoc --no-ri --verbose <%= bootstrap_version_string %>
|
|
12
|
-
|
|
13
|
-
mkdir -p /etc/chef
|
|
14
|
-
|
|
15
|
-
(
|
|
16
|
-
cat <<'EOP'
|
|
17
|
-
<%= validation_key %>
|
|
18
|
-
EOP
|
|
19
|
-
) > /tmp/validation.pem
|
|
20
|
-
cat /tmp/validation.pem > /etc/chef/validation.pem
|
|
21
|
-
rm /tmp/validation.pem
|
|
22
|
-
chmod 0600 /etc/chef/validation.pem
|
|
23
|
-
|
|
24
|
-
<% if @chef_config[:encrypted_data_bag_secret] -%>
|
|
25
|
-
(
|
|
26
|
-
cat <<'EOP'
|
|
27
|
-
<%= encrypted_data_bag_secret %>
|
|
28
|
-
EOP
|
|
29
|
-
) > /tmp/encrypted_data_bag_secret
|
|
30
|
-
cat /tmp/encrypted_data_bag_secret > /etc/chef/encrypted_data_bag_secret
|
|
31
|
-
rm /tmp/encrypted_data_bag_secret
|
|
32
|
-
chmod 0600 /etc/chef/encrypted_data_bag_secret
|
|
33
|
-
<% end -%>
|
|
34
|
-
|
|
35
|
-
<%# Generate Ohai Hints -%>
|
|
36
|
-
<% unless @chef_config[:knife][:hints].nil? || @chef_config[:knife][:hints].empty? -%>
|
|
37
|
-
mkdir -p /etc/chef/ohai/hints
|
|
38
|
-
|
|
39
|
-
<% @chef_config[:knife][:hints].each do |name, hash| -%>
|
|
40
|
-
(
|
|
41
|
-
cat <<'EOP'
|
|
42
|
-
<%= hash.to_json %>
|
|
43
|
-
EOP
|
|
44
|
-
) > /etc/chef/ohai/hints/<%= name %>.json
|
|
45
|
-
<% end -%>
|
|
46
|
-
<% end -%>
|
|
47
|
-
|
|
48
|
-
(
|
|
49
|
-
cat <<'EOP'
|
|
50
|
-
<%= config_content %>
|
|
51
|
-
EOP
|
|
52
|
-
) > /etc/chef/client.rb
|
|
53
|
-
|
|
54
|
-
(
|
|
55
|
-
cat <<'EOP'
|
|
56
|
-
<%= first_boot.to_json %>
|
|
57
|
-
EOP
|
|
58
|
-
) > /etc/chef/first-boot.json
|
|
59
|
-
|
|
60
|
-
<%= start_chef %>'
|
|
@@ -1,50 +0,0 @@
|
|
|
1
|
-
#
|
|
2
|
-
# Author:: Seth Chisamore (<schisamo@opscode.com>)
|
|
3
|
-
# Copyright:: Copyright (c) 2011 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
|
-
# ensure data is written and read in binary mode
|
|
20
|
-
# stops "dump format error for symbol(0x75)" errors
|
|
21
|
-
module Moneta
|
|
22
|
-
class BasicFile
|
|
23
|
-
|
|
24
|
-
def store(key, value, options = {})
|
|
25
|
-
ensure_directory_created(::File.dirname(path(key)))
|
|
26
|
-
::File.open(path(key), "wb") do |file|
|
|
27
|
-
if @expires
|
|
28
|
-
data = {:value => value}
|
|
29
|
-
if options[:expires_in]
|
|
30
|
-
data[:expires_at] = Time.now + options[:expires_in]
|
|
31
|
-
end
|
|
32
|
-
contents = Marshal.dump(data)
|
|
33
|
-
else
|
|
34
|
-
contents = Marshal.dump(value)
|
|
35
|
-
end
|
|
36
|
-
file.puts(contents)
|
|
37
|
-
end
|
|
38
|
-
end
|
|
39
|
-
|
|
40
|
-
def raw_get(key)
|
|
41
|
-
if ::File.respond_to?(:binread)
|
|
42
|
-
data = ::File.binread(path(key))
|
|
43
|
-
else
|
|
44
|
-
data = ::File.open(path(key),"rb") { |f| f.read }
|
|
45
|
-
end
|
|
46
|
-
Marshal.load(data)
|
|
47
|
-
end
|
|
48
|
-
|
|
49
|
-
end
|
|
50
|
-
end
|
|
@@ -1,70 +0,0 @@
|
|
|
1
|
-
# Ruby is copyrighted free software by Yukihiro Matsumoto <matz@netlab.jp>.
|
|
2
|
-
# You can redistribute it and/or modify it under either the terms of the
|
|
3
|
-
# 2-clause BSDL (see the file BSDL), or the conditions below:
|
|
4
|
-
#
|
|
5
|
-
# 1. You may make and give away verbatim copies of the source form of the
|
|
6
|
-
# software without restriction, provided that you duplicate all of the
|
|
7
|
-
# original copyright notices and associated disclaimers.
|
|
8
|
-
#
|
|
9
|
-
# 2. You may modify your copy of the software in any way, provided that
|
|
10
|
-
# you do at least ONE of the following:
|
|
11
|
-
#
|
|
12
|
-
# a) place your modifications in the Public Domain or otherwise
|
|
13
|
-
# make them Freely Available, such as by posting said
|
|
14
|
-
# modifications to Usenet or an equivalent medium, or by allowing
|
|
15
|
-
# the author to include your modifications in the software.
|
|
16
|
-
#
|
|
17
|
-
# b) use the modified software only within your corporation or
|
|
18
|
-
# organization.
|
|
19
|
-
#
|
|
20
|
-
# c) give non-standard binaries non-standard names, with
|
|
21
|
-
# instructions on where to get the original software distribution.
|
|
22
|
-
#
|
|
23
|
-
# d) make other distribution arrangements with the author.
|
|
24
|
-
#
|
|
25
|
-
# 3. You may distribute the software in object code or binary form,
|
|
26
|
-
# provided that you do at least ONE of the following:
|
|
27
|
-
#
|
|
28
|
-
# a) distribute the binaries and library files of the software,
|
|
29
|
-
# together with instructions (in the manual page or equivalent)
|
|
30
|
-
# on where to get the original distribution.
|
|
31
|
-
#
|
|
32
|
-
# b) accompany the distribution with the machine-readable source of
|
|
33
|
-
# the software.
|
|
34
|
-
#
|
|
35
|
-
# c) give non-standard binaries non-standard names, with
|
|
36
|
-
# instructions on where to get the original software distribution.
|
|
37
|
-
#
|
|
38
|
-
# d) make other distribution arrangements with the author.
|
|
39
|
-
#
|
|
40
|
-
# 4. You may modify and include the part of the software into any other
|
|
41
|
-
# software (possibly commercial). But some files in the distribution
|
|
42
|
-
# are not written by the author, so that they are not under these terms.
|
|
43
|
-
#
|
|
44
|
-
# For the list of those files and their copying conditions, see the
|
|
45
|
-
# file LEGAL.
|
|
46
|
-
#
|
|
47
|
-
# 5. The scripts and library files supplied as input to or produced as
|
|
48
|
-
# output from the software do not automatically fall under the
|
|
49
|
-
# copyright of the software, but belong to whomever generated them,
|
|
50
|
-
# and may be sold commercially, and may be aggregated with this
|
|
51
|
-
# software.
|
|
52
|
-
#
|
|
53
|
-
# 6. THIS SOFTWARE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR
|
|
54
|
-
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
|
|
55
|
-
# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
|
|
56
|
-
# PURPOSE.
|
|
57
|
-
|
|
58
|
-
require 'uri'
|
|
59
|
-
|
|
60
|
-
unless URI::Generic.instance_methods.map {|m| m.to_s}.include?("hostname")
|
|
61
|
-
|
|
62
|
-
class URI::Generic
|
|
63
|
-
# Copied from the MRI source for Ruby 1.9.3
|
|
64
|
-
# File lib/uri/generic.rb, line 659
|
|
65
|
-
def hostname
|
|
66
|
-
v = self.host
|
|
67
|
-
/\A\[(.*)\]\z/ =~ v ? $1 : v
|
|
68
|
-
end
|
|
69
|
-
end
|
|
70
|
-
end
|