chef 12.0.0.alpha.2-x86-mingw32 → 12.0.0.rc.0-x86-mingw32
Sign up to get free protection for your applications and to get access to all the features.
- data/CONTRIBUTING.md +9 -0
- data/README.md +1 -1
- data/Rakefile +12 -0
- data/bin/chef-service-manager +1 -1
- data/bin/chef-windows-service +35 -0
- data/distro/common/html/_sources/ctl_chef_server.txt +307 -10
- data/distro/common/html/ctl_chef_client.html +3 -7
- data/distro/common/html/ctl_chef_server.html +609 -41
- data/distro/common/html/ctl_chef_shell.html +2 -2
- data/distro/common/html/ctl_chef_solo.html +1 -1
- data/distro/common/html/index.html +13 -13
- data/distro/common/html/knife.html +10 -10
- data/distro/common/html/knife_bootstrap.html +8 -8
- data/distro/common/html/knife_client.html +12 -12
- data/distro/common/html/knife_common_options.html +7 -7
- data/distro/common/html/knife_configure.html +3 -3
- data/distro/common/html/knife_cookbook.html +19 -19
- data/distro/common/html/knife_cookbook_site.html +28 -28
- data/distro/common/html/knife_data_bag.html +28 -13
- data/distro/common/html/knife_delete.html +2 -2
- data/distro/common/html/knife_deps.html +3 -3
- data/distro/common/html/knife_diff.html +4 -4
- data/distro/common/html/knife_download.html +3 -3
- data/distro/common/html/knife_edit.html +2 -2
- data/distro/common/html/knife_environment.html +14 -14
- data/distro/common/html/knife_exec.html +11 -11
- data/distro/common/html/knife_index_rebuild.html +2 -2
- data/distro/common/html/knife_list.html +3 -3
- data/distro/common/html/knife_node.html +23 -23
- data/distro/common/html/knife_raw.html +4 -4
- data/distro/common/html/knife_recipe_list.html +3 -3
- data/distro/common/html/knife_role.html +11 -11
- data/distro/common/html/knife_search.html +4 -4
- data/distro/common/html/knife_serve.html +3 -3
- data/distro/common/html/knife_show.html +3 -3
- data/distro/common/html/knife_ssh.html +7 -7
- data/distro/common/html/knife_ssl_check.html +7 -7
- data/distro/common/html/knife_ssl_fetch.html +9 -9
- data/distro/common/html/knife_status.html +3 -3
- data/distro/common/html/knife_tag.html +9 -9
- data/distro/common/html/knife_upload.html +3 -3
- data/distro/common/html/knife_user.html +9 -9
- data/distro/common/html/knife_using.html +11 -11
- data/distro/common/html/knife_xargs.html +14 -5
- data/distro/common/html/search.html +2 -2
- data/distro/common/html/searchindex.js +1 -1
- data/distro/common/man/man1/chef-shell.1 +2 -2
- data/distro/common/man/man1/knife-bootstrap.1 +7 -7
- data/distro/common/man/man1/knife-client.1 +10 -10
- data/distro/common/man/man1/knife-configure.1 +5 -5
- data/distro/common/man/man1/knife-cookbook-site.1 +24 -24
- data/distro/common/man/man1/knife-cookbook.1 +12 -12
- data/distro/common/man/man1/knife-data-bag.1 +34 -10
- data/distro/common/man/man1/knife-delete.1 +5 -5
- data/distro/common/man/man1/knife-deps.1 +5 -5
- data/distro/common/man/man1/knife-diff.1 +7 -7
- data/distro/common/man/man1/knife-download.1 +5 -5
- data/distro/common/man/man1/knife-edit.1 +5 -5
- data/distro/common/man/man1/knife-environment.1 +11 -11
- data/distro/common/man/man1/knife-exec.1 +11 -11
- data/distro/common/man/man1/knife-index-rebuild.1 +1 -1
- data/distro/common/man/man1/knife-list.1 +5 -5
- data/distro/common/man/man1/knife-node.1 +16 -16
- data/distro/common/man/man1/knife-raw.1 +6 -6
- data/distro/common/man/man1/knife-recipe-list.1 +1 -1
- data/distro/common/man/man1/knife-role.1 +7 -7
- data/distro/common/man/man1/knife-search.1 +6 -6
- data/distro/common/man/man1/knife-serve.1 +6 -6
- data/distro/common/man/man1/knife-show.1 +5 -5
- data/distro/common/man/man1/knife-ssh.1 +9 -9
- data/distro/common/man/man1/knife-ssl-check.1 +7 -7
- data/distro/common/man/man1/knife-ssl-fetch.1 +9 -9
- data/distro/common/man/man1/knife-status.1 +5 -5
- data/distro/common/man/man1/knife-tag.1 +8 -8
- data/distro/common/man/man1/knife-upload.1 +5 -5
- data/distro/common/man/man1/knife-user.1 +8 -8
- data/distro/common/man/man1/knife-xargs.1 +36 -10
- data/distro/common/man/man1/knife.1 +14 -14
- data/distro/common/man/man8/chef-client.8 +3 -10
- data/distro/common/man/man8/chef-solo.8 +1 -1
- data/ext/win32-eventlog/Rakefile +50 -0
- data/ext/win32-eventlog/chef-log.man +26 -0
- data/lib/chef/application.rb +313 -241
- data/lib/chef/application/apply.rb +10 -8
- data/lib/chef/application/client.rb +58 -33
- data/lib/chef/application/solo.rb +33 -12
- data/lib/chef/chef_fs/chef_fs_data_store.rb +1 -1
- data/lib/chef/chef_fs/command_line.rb +1 -1
- data/lib/chef/chef_fs/file_system/organization_invites_entry.rb +2 -1
- data/lib/chef/chef_fs/file_system/organization_members_entry.rb +2 -1
- data/lib/chef/chef_fs/file_system/rest_list_entry.rb +2 -1
- data/lib/chef/client.rb +18 -48
- data/lib/chef/config.rb +43 -11
- data/lib/chef/cookbook/cookbook_version_loader.rb +14 -7
- data/lib/chef/cookbook/metadata.rb +81 -38
- data/lib/chef/cookbook/syntax_check.rb +18 -52
- data/lib/chef/cookbook_loader.rb +1 -1
- data/lib/chef/cookbook_version.rb +58 -39
- data/lib/chef/data_bag.rb +2 -2
- data/lib/chef/deprecation/provider/file.rb +2 -1
- data/lib/chef/dsl/data_query.rb +2 -29
- data/lib/chef/dsl/recipe.rb +8 -22
- data/lib/chef/encrypted_data_bag_item/assertions.rb +1 -1
- data/lib/chef/encrypted_data_bag_item/check_encrypted.rb +56 -0
- data/lib/chef/encrypted_data_bag_item/encrypted_data_bag_item_assertions.rb +1 -1
- data/lib/chef/event_loggers/base.rb +62 -0
- data/lib/chef/event_loggers/windows_eventlog.rb +104 -0
- data/lib/chef/exceptions.rb +18 -1
- data/lib/chef/file_cache.rb +3 -2
- data/lib/chef/guard_interpreter/resource_guard_interpreter.rb +15 -6
- data/lib/chef/http.rb +20 -13
- data/lib/chef/http/ssl_policies.rb +2 -1
- data/lib/chef/json_compat.rb +9 -3
- data/lib/chef/knife.rb +2 -1
- data/lib/chef/knife/bootstrap.rb +12 -18
- data/lib/chef/knife/bootstrap/archlinux-gems.erb +2 -2
- data/lib/chef/knife/bootstrap/chef-aix.erb +2 -2
- data/lib/chef/knife/bootstrap/chef-full.erb +2 -2
- data/lib/chef/knife/cookbook_create.rb +1 -1
- data/lib/chef/knife/cookbook_site_share.rb +43 -8
- data/lib/chef/knife/core/bootstrap_context.rb +6 -11
- data/lib/chef/knife/core/object_loader.rb +5 -5
- data/lib/chef/knife/core/status_presenter.rb +156 -0
- data/lib/chef/knife/core/subcommand_loader.rb +6 -5
- data/lib/chef/knife/core/ui.rb +4 -4
- data/lib/chef/knife/data_bag_create.rb +7 -32
- data/lib/chef/knife/data_bag_edit.rb +24 -43
- data/lib/chef/knife/data_bag_from_file.rb +6 -31
- data/lib/chef/knife/data_bag_secret_options.rb +142 -0
- data/lib/chef/knife/data_bag_show.rb +19 -33
- data/lib/chef/knife/node_from_file.rb +9 -8
- data/lib/chef/knife/ssh.rb +0 -7
- data/lib/chef/knife/ssl_check.rb +70 -6
- data/lib/chef/knife/status.rb +11 -58
- data/lib/chef/mixin/command/unix.rb +2 -2
- data/lib/chef/mixin/convert_to_class_name.rb +54 -0
- data/lib/chef/mixin/descendants_tracker.rb +82 -0
- data/lib/chef/mixin/homebrew_user.rb +68 -0
- data/lib/chef/mixin/shell_out.rb +0 -4
- data/lib/chef/mixin/windows_architecture_helper.rb +16 -0
- data/lib/chef/mixin/windows_env_helper.rb +56 -0
- data/lib/chef/node.rb +2 -2
- data/lib/chef/node_map.rb +146 -0
- data/lib/chef/platform/provider_mapping.rb +11 -39
- data/lib/chef/platform/provider_priority_map.rb +80 -0
- data/lib/chef/platform/query_helpers.rb +5 -1
- data/lib/chef/platform/service_helpers.rb +113 -0
- data/lib/chef/provider.rb +24 -0
- data/lib/chef/provider/breakpoint.rb +2 -0
- data/lib/chef/provider/cookbook_file.rb +2 -0
- data/lib/chef/provider/cron.rb +1 -1
- data/lib/chef/provider/cron/unix.rb +13 -9
- data/lib/chef/provider/deploy.rb +3 -2
- data/lib/chef/provider/deploy/revision.rb +4 -2
- data/lib/chef/provider/deploy/timestamped.rb +2 -0
- data/lib/chef/provider/directory.rb +2 -0
- data/lib/chef/provider/dsc_script.rb +179 -0
- data/lib/chef/provider/env.rb +25 -10
- data/lib/chef/provider/env/windows.rb +9 -16
- data/lib/chef/provider/erl_call.rb +2 -0
- data/lib/chef/provider/execute.rb +5 -2
- data/lib/chef/provider/file.rb +2 -0
- data/lib/chef/provider/git.rb +51 -23
- data/lib/chef/provider/group/dscl.rb +2 -2
- data/lib/chef/provider/group/pw.rb +9 -13
- data/lib/chef/provider/http_request.rb +2 -0
- data/lib/chef/provider/link.rb +3 -0
- data/lib/chef/provider/log.rb +2 -0
- data/lib/chef/provider/lwrp_base.rb +11 -9
- data/lib/chef/provider/mount/mount.rb +1 -1
- data/lib/chef/provider/package/aix.rb +2 -0
- data/lib/chef/provider/package/apt.rb +2 -0
- data/lib/chef/provider/package/dpkg.rb +2 -0
- data/lib/chef/provider/package/easy_install.rb +2 -0
- data/lib/chef/provider/package/freebsd/pkg.rb +2 -1
- data/lib/chef/provider/package/freebsd/pkgng.rb +1 -1
- data/lib/chef/provider/package/freebsd/port.rb +1 -9
- data/lib/chef/provider/package/homebrew.rb +127 -0
- data/lib/chef/provider/package/ips.rb +2 -0
- data/lib/chef/provider/package/macports.rb +3 -0
- data/lib/chef/provider/package/pacman.rb +5 -4
- data/lib/chef/provider/package/paludis.rb +4 -2
- data/lib/chef/provider/package/portage.rb +4 -1
- data/lib/chef/provider/package/rpm.rb +2 -0
- data/lib/chef/provider/package/rubygems.rb +4 -0
- data/lib/chef/provider/package/smartos.rb +2 -0
- data/lib/chef/provider/package/solaris.rb +2 -0
- data/lib/chef/provider/package/windows.rb +5 -2
- data/lib/chef/provider/package/yum.rb +2 -0
- data/lib/chef/provider/powershell_script.rb +3 -1
- data/lib/chef/provider/remote_directory.rb +25 -10
- data/lib/chef/provider/route.rb +2 -0
- data/lib/chef/provider/ruby_block.rb +2 -0
- data/lib/chef/provider/script.rb +6 -0
- data/lib/chef/provider/service/aix.rb +128 -0
- data/lib/chef/provider/service/aixinit.rb +117 -0
- data/lib/chef/provider/service/arch.rb +6 -0
- data/lib/chef/provider/service/debian.rb +35 -29
- data/lib/chef/provider/service/freebsd.rb +7 -1
- data/lib/chef/provider/service/gentoo.rb +5 -1
- data/lib/chef/provider/service/init.rb +2 -0
- data/lib/chef/provider/service/insserv.rb +15 -8
- data/lib/chef/provider/service/invokercd.rb +6 -0
- data/lib/chef/provider/service/macosx.rb +4 -1
- data/lib/chef/provider/service/redhat.rb +9 -3
- data/lib/chef/provider/service/simple.rb +2 -0
- data/lib/chef/provider/service/solaris.rb +2 -0
- data/lib/chef/provider/service/systemd.rb +7 -0
- data/lib/chef/provider/service/upstart.rb +7 -0
- data/lib/chef/provider/service/windows.rb +5 -0
- data/lib/chef/provider/subversion.rb +2 -0
- data/lib/chef/provider/template.rb +1 -0
- data/lib/chef/provider/user/dscl.rb +3 -2
- data/lib/chef/provider/whyrun_safe_ruby_block.rb +2 -0
- data/lib/chef/provider_resolver.rb +103 -0
- data/lib/chef/providers.rb +6 -2
- data/lib/chef/recipe.rb +2 -0
- data/lib/chef/resource.rb +69 -78
- data/lib/chef/resource/apt_package.rb +3 -1
- data/lib/chef/resource/bash.rb +1 -0
- data/lib/chef/resource/bff_package.rb +0 -1
- data/lib/chef/resource/breakpoint.rb +1 -1
- data/lib/chef/resource/chef_gem.rb +1 -2
- data/lib/chef/resource/conditional.rb +26 -6
- data/lib/chef/resource/cookbook_file.rb +2 -3
- data/lib/chef/resource/csh.rb +1 -0
- data/lib/chef/resource/deploy.rb +0 -1
- data/lib/chef/resource/deploy_revision.rb +6 -1
- data/lib/chef/resource/directory.rb +1 -2
- data/lib/chef/resource/dpkg_package.rb +2 -1
- data/lib/chef/resource/dsc_script.rb +125 -0
- data/lib/chef/resource/easy_install_package.rb +2 -1
- data/lib/chef/resource/erl_call.rb +1 -0
- data/lib/chef/resource/execute.rb +26 -9
- data/lib/chef/resource/file.rb +1 -3
- data/lib/chef/resource/freebsd_package.rb +10 -23
- data/lib/chef/resource/gem_package.rb +2 -1
- data/lib/chef/resource/git.rb +2 -1
- data/lib/chef/resource/homebrew_package.rb +46 -0
- data/lib/chef/resource/http_request.rb +1 -0
- data/lib/chef/resource/ips_package.rb +3 -1
- data/lib/chef/resource/link.rb +1 -2
- data/lib/chef/resource/log.rb +4 -0
- data/lib/chef/resource/lwrp_base.rb +24 -15
- data/lib/chef/resource/macports_package.rb +3 -1
- data/lib/chef/resource/pacman_package.rb +2 -1
- data/lib/chef/resource/paludis_package.rb +3 -1
- data/lib/chef/resource/perl.rb +1 -0
- data/lib/chef/resource/powershell_script.rb +0 -2
- data/lib/chef/resource/python.rb +1 -1
- data/lib/chef/resource/remote_directory.rb +1 -2
- data/lib/chef/resource/remote_file.rb +1 -1
- data/lib/chef/resource/rpm_package.rb +2 -1
- data/lib/chef/resource/ruby.rb +1 -0
- data/lib/chef/resource/ruby_block.rb +3 -0
- data/lib/chef/resource/script.rb +2 -25
- data/lib/chef/resource/service.rb +0 -4
- data/lib/chef/resource/smartos_package.rb +3 -4
- data/lib/chef/resource/solaris_package.rb +7 -1
- data/lib/chef/resource/subversion.rb +0 -1
- data/lib/chef/resource/template.rb +2 -3
- data/lib/chef/resource/timestamped_deploy.rb +1 -2
- data/lib/chef/resource/whyrun_safe_ruby_block.rb +0 -1
- data/lib/chef/resource/windows_package.rb +3 -4
- data/lib/chef/resource/windows_script.rb +3 -0
- data/lib/chef/resource/windows_service.rb +2 -2
- data/lib/chef/resource/yum_package.rb +3 -1
- data/lib/chef/resource_collection.rb +50 -227
- data/lib/chef/resource_collection/resource_collection_serialization.rb +59 -0
- data/lib/chef/resource_collection/resource_list.rb +89 -0
- data/lib/chef/resource_collection/resource_set.rb +170 -0
- data/lib/chef/resources.rb +2 -0
- data/lib/chef/role.rb +1 -1
- data/lib/chef/run_context.rb +5 -1
- data/lib/chef/shell/ext.rb +1 -1
- data/lib/chef/util/backup.rb +3 -2
- data/lib/chef/util/dsc/configuration_generator.rb +115 -0
- data/lib/chef/util/dsc/lcm_output_parser.rb +133 -0
- data/lib/chef/util/dsc/local_configuration_manager.rb +141 -0
- data/lib/chef/util/dsc/resource_info.rb +26 -0
- data/lib/chef/util/path_helper.rb +12 -0
- data/lib/chef/util/powershell/cmdlet.rb +136 -0
- data/lib/chef/util/powershell/cmdlet_result.rb +46 -0
- data/lib/chef/version.rb +1 -1
- data/lib/chef/win32/api/system.rb +9 -0
- data/lib/chef/win32/version.rb +2 -0
- data/spec/.DS_Store +0 -0
- data/spec/data/.DS_Store +0 -0
- data/spec/data/bootstrap/test-hints.erb +1 -1
- data/spec/data/bootstrap/test.erb +1 -1
- data/spec/data/cb_version_cookbooks/cookbook2/files/test.txt +0 -0
- data/spec/data/cb_version_cookbooks/cookbook2/templates/test.erb +0 -0
- data/spec/data/cookbooks/ignorken/files/default/not_me.rb +2 -0
- data/spec/data/cookbooks/ignorken/templates/ubuntu-12.10/not_me.rb +2 -0
- data/spec/data/cookbooks/openldap/libraries/openldap.rb +4 -0
- data/spec/data/cookbooks/openldap/libraries/openldap/version.rb +3 -0
- data/spec/data/lwrp/.DS_Store +0 -0
- data/spec/data/lwrp/providers/.DS_Store +0 -0
- data/spec/data/lwrp/providers/buck_passer.rb +9 -2
- data/spec/data/lwrp/resources/.DS_Store +0 -0
- data/spec/data/lwrp/resources/foo.rb +3 -2
- data/spec/data/lwrp_override/.DS_Store +0 -0
- data/spec/data/lwrp_override/providers/.DS_Store +0 -0
- data/spec/data/lwrp_override/providers/buck_passer.rb +5 -10
- data/spec/data/lwrp_override/resources/.DS_Store +0 -0
- data/spec/data/lwrp_override/resources/foo.rb +4 -3
- data/spec/functional/assets/chefinittest +34 -0
- data/spec/functional/assets/testchefsubsys +11 -0
- data/spec/functional/dsl/reboot_pending_spec.rb +19 -16
- data/spec/functional/event_loggers/windows_eventlog_spec.rb +82 -0
- data/spec/functional/knife/cookbook_delete_spec.rb +3 -3
- data/spec/functional/knife/exec_spec.rb +1 -1
- data/spec/functional/resource/aix_service_spec.rb +136 -0
- data/spec/functional/resource/aixinit_service_spec.rb +211 -0
- data/spec/functional/resource/base.rb +1 -0
- data/spec/functional/resource/batch_spec.rb +4 -11
- data/spec/functional/resource/cron_spec.rb +7 -1
- data/spec/functional/resource/dsc_script_spec.rb +382 -0
- data/spec/functional/resource/env_spec.rb +54 -0
- data/spec/functional/resource/execute_spec.rb +113 -0
- data/spec/functional/resource/file_spec.rb +2 -0
- data/spec/functional/resource/group_spec.rb +7 -4
- data/spec/functional/resource/powershell_spec.rb +198 -185
- data/spec/functional/resource/rpm_spec.rb +5 -4
- data/spec/functional/resource/user/dscl_spec.rb +2 -1
- data/spec/functional/util/path_helper_spec.rb +37 -0
- data/spec/functional/util/powershell/cmdlet_spec.rb +114 -0
- data/spec/integration/client/client_spec.rb +1 -1
- data/spec/integration/client/ipv6_spec.rb +1 -1
- data/spec/integration/knife/chef_fs_data_store_spec.rb +1 -1
- data/spec/integration/knife/chef_repo_path_spec.rb +1 -1
- data/spec/integration/knife/chef_repository_file_system_spec.rb +1 -1
- data/spec/integration/knife/chefignore_spec.rb +1 -1
- data/spec/integration/knife/common_options_spec.rb +1 -1
- data/spec/integration/knife/cookbook_api_ipv6_spec.rb +2 -2
- data/spec/integration/knife/delete_spec.rb +1 -1
- data/spec/integration/knife/deps_spec.rb +1 -1
- data/spec/integration/knife/diff_spec.rb +1 -1
- data/spec/integration/knife/download_spec.rb +1 -1
- data/spec/integration/knife/list_spec.rb +1 -1
- data/spec/integration/knife/raw_spec.rb +1 -1
- data/spec/integration/knife/redirection_spec.rb +1 -1
- data/spec/integration/knife/serve_spec.rb +1 -1
- data/spec/integration/knife/show_spec.rb +1 -1
- data/spec/integration/knife/upload_spec.rb +4 -3
- data/spec/integration/recipes/lwrp_inline_resources_spec.rb +1 -1
- data/spec/spec_helper.rb +15 -0
- data/spec/support/chef_helpers.rb +1 -0
- data/spec/support/lib/chef/provider/snakeoil.rb +1 -0
- data/spec/support/lib/chef/resource/zen_follower.rb +1 -7
- data/spec/support/platform_helpers.rb +28 -0
- data/spec/support/shared/functional/file_resource.rb +6 -0
- data/spec/support/shared/functional/windows_script.rb +118 -0
- data/spec/support/shared/integration/integration_helper.rb +5 -2
- data/spec/support/shared/matchers/exit_with_code.rb +28 -0
- data/spec/support/shared/matchers/match_environment_variable.rb +17 -0
- data/spec/support/shared/shared_examples.rb +14 -0
- data/spec/support/shared/unit/execute_resource.rb +0 -7
- data/spec/support/shared/unit/resource/static_provider_resolution.rb +71 -0
- data/spec/support/shared/unit/script_resource.rb +1 -1
- data/spec/support/shared/unit/windows_script_resource.rb +35 -2
- data/spec/tiny_server.rb +1 -2
- data/spec/unit/api_client_spec.rb +5 -1
- data/spec/unit/application/{apply.rb → apply_spec.rb} +13 -5
- data/spec/unit/application/client_spec.rb +106 -13
- data/spec/unit/application/solo_spec.rb +25 -1
- data/spec/unit/client_spec.rb +1 -26
- data/spec/unit/config_fetcher_spec.rb +2 -1
- data/spec/unit/config_spec.rb +91 -2
- data/spec/unit/cookbook/cookbook_version_loader_spec.rb +8 -0
- data/spec/unit/cookbook/metadata_spec.rb +43 -6
- data/spec/unit/cookbook/syntax_check_spec.rb +8 -2
- data/spec/unit/cookbook_loader_spec.rb +4 -2
- data/spec/unit/cookbook_version_spec.rb +83 -2
- data/spec/unit/data_bag_item_spec.rb +5 -1
- data/spec/unit/data_bag_spec.rb +6 -1
- data/spec/unit/dsl/data_query_spec.rb +8 -110
- data/spec/unit/encrypted_data_bag_item/check_encrypted_spec.rb +95 -0
- data/spec/unit/encrypted_data_bag_item_spec.rb +16 -23
- data/spec/unit/environment_spec.rb +6 -2
- data/spec/unit/exceptions_spec.rb +6 -0
- data/spec/unit/guard_interpreter/resource_guard_interpreter_spec.rb +16 -15
- data/spec/unit/json_compat_spec.rb +12 -2
- data/spec/unit/knife/bootstrap_spec.rb +16 -63
- data/spec/unit/knife/cookbook_site_share_spec.rb +59 -6
- data/spec/unit/knife/core/bootstrap_context_spec.rb +8 -37
- data/spec/unit/knife/core/subcommand_loader_spec.rb +1 -1
- data/spec/unit/knife/core/ui_spec.rb +28 -0
- data/spec/unit/knife/data_bag_create_spec.rb +63 -71
- data/spec/unit/knife/data_bag_edit_spec.rb +83 -49
- data/spec/unit/knife/data_bag_from_file_spec.rb +104 -126
- data/spec/unit/knife/data_bag_secret_options_spec.rb +165 -0
- data/spec/unit/knife/data_bag_show_spec.rb +74 -72
- data/spec/unit/knife/environment_from_file_spec.rb +3 -2
- data/spec/unit/knife/ssl_check_spec.rb +46 -1
- data/spec/unit/knife/status_spec.rb +1 -2
- data/spec/unit/knife_spec.rb +18 -1
- data/spec/unit/lwrp_spec.rb +29 -8
- data/spec/unit/mixin/homebrew_user_spec.rb +100 -0
- data/spec/unit/node_map_spec.rb +155 -0
- data/spec/unit/node_spec.rb +11 -0
- data/spec/unit/platform/query_helpers_spec.rb +23 -0
- data/spec/unit/platform_spec.rb +23 -0
- data/spec/unit/provider/breakpoint_spec.rb +9 -9
- data/spec/unit/provider/cookbook_file/content_spec.rb +3 -3
- data/spec/unit/provider/cookbook_file_spec.rb +1 -1
- data/spec/unit/provider/cron/unix_spec.rb +78 -60
- data/spec/unit/provider/cron_spec.rb +175 -175
- data/spec/unit/provider/deploy/revision_spec.rb +22 -21
- data/spec/unit/provider/deploy/timestamped_spec.rb +3 -3
- data/spec/unit/provider/deploy_spec.rb +231 -230
- data/spec/unit/provider/directory_spec.rb +55 -55
- data/spec/unit/provider/dsc_script_spec.rb +174 -0
- data/spec/unit/provider/env/windows_spec.rb +70 -34
- data/spec/unit/provider/env_spec.rb +95 -49
- data/spec/unit/provider/erl_call_spec.rb +9 -9
- data/spec/unit/provider/execute_spec.rb +43 -27
- data/spec/unit/provider/file/content_spec.rb +9 -9
- data/spec/unit/provider/file_spec.rb +1 -1
- data/spec/unit/provider/git_spec.rb +221 -159
- data/spec/unit/provider/group/dscl_spec.rb +64 -63
- data/spec/unit/provider/group/gpasswd_spec.rb +14 -14
- data/spec/unit/provider/group/groupadd_spec.rb +33 -33
- data/spec/unit/provider/group/groupmod_spec.rb +23 -23
- data/spec/unit/provider/group/pw_spec.rb +21 -21
- data/spec/unit/provider/group/usermod_spec.rb +20 -20
- data/spec/unit/provider/group/windows_spec.rb +15 -15
- data/spec/unit/provider/group_spec.rb +76 -76
- data/spec/unit/provider/http_request_spec.rb +30 -30
- data/spec/unit/provider/ifconfig/aix_spec.rb +20 -20
- data/spec/unit/provider/ifconfig/debian_spec.rb +25 -9
- data/spec/unit/provider/ifconfig/redhat_spec.rb +13 -13
- data/spec/unit/provider/ifconfig_spec.rb +43 -43
- data/spec/unit/provider/link_spec.rb +60 -60
- data/spec/unit/provider/log_spec.rb +0 -4
- data/spec/unit/provider/mdadm_spec.rb +23 -23
- data/spec/unit/provider/mount/aix_spec.rb +17 -17
- data/spec/unit/provider/mount/mount_spec.rb +115 -119
- data/spec/unit/provider/mount/solaris_spec.rb +72 -72
- data/spec/unit/provider/mount/windows_spec.rb +24 -24
- data/spec/unit/provider/ohai_spec.rb +11 -11
- data/spec/unit/provider/package/aix_spec.rb +34 -34
- data/spec/unit/provider/package/apt_spec.rb +36 -36
- data/spec/unit/provider/package/dpkg_spec.rb +27 -27
- data/spec/unit/provider/package/easy_install_spec.rb +16 -16
- data/spec/unit/provider/package/freebsd/pkg_spec.rb +53 -53
- data/spec/unit/provider/package/freebsd/pkgng_spec.rb +24 -24
- data/spec/unit/provider/package/freebsd/port_spec.rb +45 -35
- data/spec/unit/provider/package/homebrew_spec.rb +266 -0
- data/spec/unit/provider/package/ips_spec.rb +34 -34
- data/spec/unit/provider/package/macports_spec.rb +49 -49
- data/spec/unit/provider/package/pacman_spec.rb +35 -39
- data/spec/unit/provider/package/paludis_spec.rb +20 -20
- data/spec/unit/provider/package/portage_spec.rb +38 -38
- data/spec/unit/provider/package/rpm_spec.rb +29 -29
- data/spec/unit/provider/package/rubygems_spec.rb +284 -270
- data/spec/unit/provider/package/smartos_spec.rb +15 -15
- data/spec/unit/provider/package/solaris_spec.rb +35 -35
- data/spec/unit/provider/package/windows/msi_spec.rb +3 -3
- data/spec/unit/provider/package/windows_spec.rb +6 -6
- data/spec/unit/provider/package/yum_spec.rb +416 -416
- data/spec/unit/provider/package/zypper_spec.rb +47 -47
- data/spec/unit/provider/package_spec.rb +107 -107
- data/spec/unit/provider/powershell_spec.rb +1 -1
- data/spec/unit/provider/registry_key_spec.rb +61 -61
- data/spec/unit/provider/remote_directory_spec.rb +36 -36
- data/spec/unit/provider/remote_file/cache_control_data_spec.rb +24 -24
- data/spec/unit/provider/remote_file/content_spec.rb +45 -45
- data/spec/unit/provider/remote_file/fetcher_spec.rb +9 -9
- data/spec/unit/provider/remote_file/ftp_spec.rb +32 -32
- data/spec/unit/provider/remote_file/http_spec.rb +44 -44
- data/spec/unit/provider/remote_file/local_file_spec.rb +9 -9
- data/spec/unit/provider/remote_file_spec.rb +3 -3
- data/spec/unit/provider/route_spec.rb +63 -63
- data/spec/unit/provider/ruby_block_spec.rb +4 -4
- data/spec/unit/provider/script_spec.rb +12 -12
- data/spec/unit/provider/service/aix_service_spec.rb +181 -0
- data/spec/unit/provider/service/aixinit_service_spec.rb +269 -0
- data/spec/unit/provider/service/arch_service_spec.rb +48 -48
- data/spec/unit/provider/service/debian_service_spec.rb +40 -40
- data/spec/unit/provider/service/gentoo_service_spec.rb +28 -28
- data/spec/unit/provider/service/init_service_spec.rb +39 -39
- data/spec/unit/provider/service/insserv_service_spec.rb +8 -8
- data/spec/unit/provider/service/invokercd_service_spec.rb +35 -35
- data/spec/unit/provider/service/macosx_spec.rb +49 -49
- data/spec/unit/provider/service/redhat_spec.rb +27 -27
- data/spec/unit/provider/service/simple_service_spec.rb +28 -28
- data/spec/unit/provider/service/solaris_smf_service_spec.rb +43 -46
- data/spec/unit/provider/service/systemd_service_spec.rb +63 -63
- data/spec/unit/provider/service/upstart_service_spec.rb +78 -78
- data/spec/unit/provider/service/windows_spec.rb +92 -92
- data/spec/unit/provider/service_spec.rb +40 -40
- data/spec/unit/provider/subversion_spec.rb +80 -80
- data/spec/unit/provider/template/content_spec.rb +9 -9
- data/spec/unit/provider/template_spec.rb +6 -6
- data/spec/unit/provider/user/dscl_spec.rb +170 -167
- data/spec/unit/provider/user/pw_spec.rb +48 -48
- data/spec/unit/provider/user/solaris_spec.rb +8 -8
- data/spec/unit/provider/user/useradd_spec.rb +1 -1
- data/spec/unit/provider/user/windows_spec.rb +26 -26
- data/spec/unit/provider/user_spec.rb +72 -72
- data/spec/unit/provider/whyrun_safe_ruby_block_spec.rb +4 -4
- data/spec/unit/provider_resolver_spec.rb +387 -0
- data/spec/unit/recipe_spec.rb +33 -12
- data/spec/unit/resource/apt_package_spec.rb +10 -13
- data/spec/unit/resource/bash_spec.rb +4 -4
- data/spec/unit/resource/batch_spec.rb +1 -1
- data/spec/unit/resource/breakpoint_spec.rb +11 -7
- data/spec/unit/resource/chef_gem_spec.rb +8 -15
- data/spec/unit/resource/conditional_action_not_nothing_spec.rb +2 -2
- data/spec/unit/resource/conditional_spec.rb +35 -16
- data/spec/unit/resource/cookbook_file_spec.rb +13 -13
- data/spec/unit/resource/cron_spec.rb +37 -37
- data/spec/unit/resource/csh_spec.rb +4 -4
- data/spec/unit/resource/deploy_revision_spec.rb +13 -18
- data/spec/unit/resource/deploy_spec.rb +60 -55
- data/spec/unit/resource/directory_spec.rb +18 -18
- data/spec/unit/resource/dpkg_package_spec.rb +8 -14
- data/spec/unit/resource/dsc_script_spec.rb +98 -0
- data/spec/unit/resource/easy_install_package_spec.rb +9 -18
- data/spec/unit/resource/env_spec.rb +12 -12
- data/spec/unit/resource/erl_call_spec.rb +11 -11
- data/spec/unit/resource/execute_spec.rb +5 -0
- data/spec/unit/resource/file_spec.rb +29 -29
- data/spec/unit/resource/freebsd_package_spec.rb +11 -12
- data/spec/unit/resource/gem_package_spec.rb +8 -15
- data/spec/unit/resource/git_spec.rb +12 -8
- data/spec/unit/resource/group_spec.rb +27 -27
- data/spec/unit/resource/homebrew_package_spec.rb +50 -0
- data/spec/unit/resource/http_request_spec.rb +6 -6
- data/spec/unit/resource/ifconfig_spec.rb +8 -8
- data/spec/unit/resource/ips_package_spec.rb +10 -13
- data/spec/unit/resource/link_spec.rb +25 -25
- data/spec/unit/resource/log_spec.rb +9 -9
- data/spec/unit/resource/macports_package_spec.rb +8 -13
- data/spec/unit/resource/mdadm_spec.rb +18 -18
- data/spec/unit/resource/mount_spec.rb +45 -45
- data/spec/unit/resource/ohai_spec.rb +7 -7
- data/spec/unit/resource/package_spec.rb +12 -12
- data/spec/unit/resource/pacman_package_spec.rb +8 -14
- data/spec/unit/resource/perl_spec.rb +4 -4
- data/spec/unit/resource/portage_package_spec.rb +3 -3
- data/spec/unit/resource/powershell_spec.rb +7 -7
- data/spec/unit/resource/python_spec.rb +4 -4
- data/spec/unit/resource/registry_key_spec.rb +32 -32
- data/spec/unit/resource/remote_directory_spec.rb +17 -17
- data/spec/unit/resource/remote_file_spec.rb +41 -41
- data/spec/unit/resource/route_spec.rb +19 -19
- data/spec/unit/resource/rpm_package_spec.rb +9 -13
- data/spec/unit/resource/ruby_block_spec.rb +8 -8
- data/spec/unit/resource/ruby_spec.rb +4 -4
- data/spec/unit/resource/scm_spec.rb +40 -40
- data/spec/unit/resource/script_spec.rb +2 -2
- data/spec/unit/resource/service_spec.rb +37 -47
- data/spec/unit/resource/smartos_package_spec.rb +10 -15
- data/spec/unit/resource/solaris_package_spec.rb +13 -28
- data/spec/unit/resource/subversion_spec.rb +16 -12
- data/spec/unit/resource/template_spec.rb +35 -35
- data/spec/unit/resource/timestamped_deploy_spec.rb +30 -4
- data/spec/unit/resource/user_spec.rb +23 -23
- data/spec/unit/resource/windows_package_spec.rb +17 -10
- data/spec/unit/resource/windows_service_spec.rb +9 -6
- data/spec/unit/resource/yum_package_spec.rb +16 -21
- data/spec/unit/resource_collection/resource_list_spec.rb +137 -0
- data/spec/unit/resource_collection/resource_set_spec.rb +199 -0
- data/spec/unit/resource_collection_spec.rb +73 -92
- data/spec/unit/resource_definition_spec.rb +38 -40
- data/spec/unit/resource_reporter_spec.rb +3 -3
- data/spec/unit/resource_spec.rb +68 -33
- data/spec/unit/rest_spec.rb +83 -76
- data/spec/unit/role_spec.rb +5 -0
- data/spec/unit/run_list_spec.rb +5 -1
- data/spec/unit/runner_spec.rb +245 -238
- data/spec/unit/shell/shell_ext_spec.rb +1 -1
- data/spec/unit/user_spec.rb +5 -1
- data/spec/unit/util/dsc/configuration_generator_spec.rb +171 -0
- data/spec/unit/util/dsc/lcm_output_parser_spec.rb +169 -0
- data/spec/unit/util/dsc/local_configuration_manager_spec.rb +139 -0
- data/spec/unit/util/path_helper_spec.rb +23 -1
- data/spec/unit/util/powershell/cmdlet_spec.rb +106 -0
- data/spec/unit/workstation_config_loader_spec.rb +1 -1
- metadata +303 -196
- checksums.yaml +0 -7
- data/distro/README +0 -2
- data/distro/arch/etc/conf.d/chef-client.conf +0 -5
- data/distro/arch/etc/conf.d/chef-expander.conf +0 -8
- data/distro/arch/etc/conf.d/chef-server-webui.conf +0 -10
- data/distro/arch/etc/conf.d/chef-server.conf +0 -10
- data/distro/arch/etc/conf.d/chef-solr.conf +0 -8
- data/distro/arch/etc/rc.d/chef-client +0 -90
- data/distro/arch/etc/rc.d/chef-expander +0 -78
- data/distro/arch/etc/rc.d/chef-server +0 -78
- data/distro/arch/etc/rc.d/chef-server-webui +0 -78
- data/distro/arch/etc/rc.d/chef-solr +0 -78
- data/distro/debian/etc/default/chef-client +0 -4
- data/distro/debian/etc/default/chef-expander +0 -8
- data/distro/debian/etc/default/chef-server +0 -9
- data/distro/debian/etc/default/chef-server-webui +0 -9
- data/distro/debian/etc/default/chef-solr +0 -8
- data/distro/debian/etc/init.d/chef-client +0 -212
- data/distro/debian/etc/init.d/chef-expander +0 -176
- data/distro/debian/etc/init.d/chef-server +0 -122
- data/distro/debian/etc/init.d/chef-server-webui +0 -123
- data/distro/debian/etc/init.d/chef-solr +0 -176
- data/distro/debian/etc/init/chef-client.conf +0 -17
- data/distro/debian/etc/init/chef-expander.conf +0 -17
- data/distro/debian/etc/init/chef-server-webui.conf +0 -17
- data/distro/debian/etc/init/chef-server.conf +0 -17
- data/distro/debian/etc/init/chef-solr.conf +0 -17
- data/distro/redhat/etc/init.d/chef-client +0 -121
- data/distro/redhat/etc/init.d/chef-expander +0 -104
- data/distro/redhat/etc/init.d/chef-server +0 -112
- data/distro/redhat/etc/init.d/chef-server-webui +0 -112
- data/distro/redhat/etc/init.d/chef-solr +0 -104
- data/distro/redhat/etc/logrotate.d/chef-client +0 -8
- data/distro/redhat/etc/logrotate.d/chef-expander +0 -8
- data/distro/redhat/etc/logrotate.d/chef-server +0 -8
- data/distro/redhat/etc/logrotate.d/chef-server-webui +0 -8
- data/distro/redhat/etc/logrotate.d/chef-solr +0 -8
- data/distro/redhat/etc/sysconfig/chef-client +0 -15
- data/distro/redhat/etc/sysconfig/chef-expander +0 -7
- data/distro/redhat/etc/sysconfig/chef-server +0 -14
- data/distro/redhat/etc/sysconfig/chef-server-webui +0 -14
- data/distro/redhat/etc/sysconfig/chef-solr +0 -8
- data/distro/windows/service_manager.rb +0 -20
- data/lib/chef/resource_platform_map.rb +0 -151
- data/spec/support/shared/matchers.rb +0 -17
- data/spec/unit/resource_platform_map_spec.rb +0 -164
@@ -121,7 +121,7 @@ describe Shell::Extensions do
|
|
121
121
|
Shell.session.stub(:rebuild_context)
|
122
122
|
events = Chef::EventDispatch::Dispatcher.new
|
123
123
|
run_context = Chef::RunContext.new(Chef::Node.new, {}, events)
|
124
|
-
run_context.resource_collection.instance_variable_set(:@iterator, :the_iterator)
|
124
|
+
run_context.resource_collection.instance_variable_get(:@resource_list).instance_variable_set(:@iterator, :the_iterator)
|
125
125
|
Shell.session.run_context = run_context
|
126
126
|
@root_context.chef_run.should == :the_iterator
|
127
127
|
end
|
data/spec/unit/user_spec.rb
CHANGED
@@ -154,6 +154,10 @@ describe Chef::User do
|
|
154
154
|
it "does not include the password if not present" do
|
155
155
|
@json.should_not include("password")
|
156
156
|
end
|
157
|
+
|
158
|
+
include_examples "to_json equalivent to Chef::JSONCompat.to_json" do
|
159
|
+
let(:jsonable) { @user }
|
160
|
+
end
|
157
161
|
end
|
158
162
|
|
159
163
|
describe "when deserializing from JSON" do
|
@@ -163,7 +167,7 @@ describe Chef::User do
|
|
163
167
|
"private_key" => "pandas",
|
164
168
|
"password" => "password",
|
165
169
|
"admin" => true }
|
166
|
-
@user = Chef::User.from_json(
|
170
|
+
@user = Chef::User.from_json(Chef::JSONCompat.to_json(user))
|
167
171
|
end
|
168
172
|
|
169
173
|
it "should deserialize to a Chef::User object" do
|
@@ -0,0 +1,171 @@
|
|
1
|
+
#
|
2
|
+
# Author:: Jay Mundrawala <jmundrawala@getchef.com>
|
3
|
+
# Copyright:: Copyright (c) 2014 Chef Software, 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'
|
20
|
+
require 'chef/util/dsc/configuration_generator'
|
21
|
+
|
22
|
+
describe Chef::Util::DSC::ConfigurationGenerator do
|
23
|
+
let(:conf_man) do
|
24
|
+
node = Chef::Node.new
|
25
|
+
Chef::Util::DSC::ConfigurationGenerator.new(node, 'tmp')
|
26
|
+
end
|
27
|
+
|
28
|
+
describe '#validate_configuration_name!' do
|
29
|
+
it 'should not raise an error if a name contains all upper case letters' do
|
30
|
+
conf_man.send(:validate_configuration_name!, "HELLO")
|
31
|
+
end
|
32
|
+
|
33
|
+
it 'should not raise an error if the name contains all lower case letters' do
|
34
|
+
conf_man.send(:validate_configuration_name!, "hello")
|
35
|
+
end
|
36
|
+
|
37
|
+
it 'should not raise an error if no special characters are used except _' do
|
38
|
+
conf_man.send(:validate_configuration_name!, "hello_world")
|
39
|
+
end
|
40
|
+
|
41
|
+
%w{! @ # $ % ^ & * & * ( ) - = + \{ \} . ? < > \\ /}.each do |sym|
|
42
|
+
it "raises an Argument error if it configuration name contains #{sym}" do
|
43
|
+
expect {
|
44
|
+
conf_man.send(:validate_configuration_name!, "Hello#{sym}")
|
45
|
+
}.to raise_error(ArgumentError)
|
46
|
+
end
|
47
|
+
end
|
48
|
+
end
|
49
|
+
|
50
|
+
describe "#get_merged_configuration_flags" do
|
51
|
+
context 'when strings are used as switches' do
|
52
|
+
it 'should merge the hash if there are no restricted switches' do
|
53
|
+
merged = conf_man.send(:get_merged_configuration_flags!, {'flag' => 'a'}, 'hello')
|
54
|
+
merged.should include(:flag)
|
55
|
+
merged[:flag].should eql('a')
|
56
|
+
merged.should include(:outputpath)
|
57
|
+
end
|
58
|
+
|
59
|
+
it 'should raise an ArgumentError if you try to override outputpath' do
|
60
|
+
expect {
|
61
|
+
conf_man.send(:get_merged_configuration_flags!, {'outputpath' => 'a'}, 'hello')
|
62
|
+
}.to raise_error(ArgumentError)
|
63
|
+
end
|
64
|
+
|
65
|
+
it 'should be case insensitive for switches that are not allowed' do
|
66
|
+
expect {
|
67
|
+
conf_man.send(:get_merged_configuration_flags!, {'OutputPath' => 'a'}, 'hello')
|
68
|
+
}.to raise_error(ArgumentError)
|
69
|
+
end
|
70
|
+
|
71
|
+
it 'should be case insensitive to switches that are allowed' do
|
72
|
+
merged = conf_man.send(:get_merged_configuration_flags!, {'FLAG' => 'a'}, 'hello')
|
73
|
+
merged.should include(:flag)
|
74
|
+
end
|
75
|
+
end
|
76
|
+
|
77
|
+
context 'when symbols are used as switches' do
|
78
|
+
it 'should merge the hash if there are no restricted switches' do
|
79
|
+
merged = conf_man.send(:get_merged_configuration_flags!, {:flag => 'a'}, 'hello')
|
80
|
+
merged.should include(:flag)
|
81
|
+
merged[:flag].should eql('a')
|
82
|
+
merged.should include(:outputpath)
|
83
|
+
end
|
84
|
+
|
85
|
+
it 'should raise an ArgumentError if you try to override outputpath' do
|
86
|
+
expect {
|
87
|
+
conf_man.send(:get_merged_configuration_flags!, {:outputpath => 'a'}, 'hello')
|
88
|
+
}.to raise_error(ArgumentError)
|
89
|
+
end
|
90
|
+
|
91
|
+
it 'should be case insensitive for switches that are not allowed' do
|
92
|
+
expect {
|
93
|
+
conf_man.send(:get_merged_configuration_flags!, {:OutputPath => 'a'}, 'hello')
|
94
|
+
}.to raise_error(ArgumentError)
|
95
|
+
end
|
96
|
+
|
97
|
+
it 'should be case insensitive to switches that are allowed' do
|
98
|
+
merged = conf_man.send(:get_merged_configuration_flags!, {:FLAG => 'a'}, 'hello')
|
99
|
+
merged.should include(:flag)
|
100
|
+
end
|
101
|
+
end
|
102
|
+
|
103
|
+
context 'when there are no flags' do
|
104
|
+
it 'should supply an output path if configuration_flags is an empty hash' do
|
105
|
+
merged = conf_man.send(:get_merged_configuration_flags!, {}, 'hello')
|
106
|
+
merged.should include(:outputpath)
|
107
|
+
merged.length.should eql(1)
|
108
|
+
end
|
109
|
+
|
110
|
+
it 'should supply an output path if configuration_flags is an empty hash' do
|
111
|
+
merged = conf_man.send(:get_merged_configuration_flags!, nil, 'hello')
|
112
|
+
merged.should include(:outputpath)
|
113
|
+
merged.length.should eql(1)
|
114
|
+
end
|
115
|
+
end
|
116
|
+
|
117
|
+
# What should happen if configuration flags contains duplicates?
|
118
|
+
# flagA => 'a', flaga => 'a'
|
119
|
+
# or
|
120
|
+
# flagA => 'a', flaga => 'b'
|
121
|
+
#
|
122
|
+
end
|
123
|
+
|
124
|
+
describe '#write_document_generation_script' do
|
125
|
+
let(:file_like_object) { double("file like object") }
|
126
|
+
|
127
|
+
it "should write the input to a file" do
|
128
|
+
allow(File).to receive(:open).and_yield(file_like_object)
|
129
|
+
allow(File).to receive(:join) do |a, b|
|
130
|
+
[a,b].join("++")
|
131
|
+
end
|
132
|
+
allow(file_like_object).to receive(:write)
|
133
|
+
conf_man.send(:write_document_generation_script, 'file', 'hello')
|
134
|
+
expect(file_like_object).to have_received(:write)
|
135
|
+
end
|
136
|
+
end
|
137
|
+
|
138
|
+
describe "#find_configuration_document" do
|
139
|
+
it "should find the mof file" do
|
140
|
+
# These tests seem way too implementation specific. Unfortunatly, File and Dir
|
141
|
+
# need to be mocked because they are OS specific
|
142
|
+
allow(File).to receive(:join) do |a, b|
|
143
|
+
[a,b].join("++")
|
144
|
+
end
|
145
|
+
|
146
|
+
allow(Dir).to receive(:entries).with("tmp++hello") {['f1', 'f2', 'hello.mof', 'f3']}
|
147
|
+
expect(conf_man.send(:find_configuration_document, 'hello')).to eql('tmp++hello++hello.mof')
|
148
|
+
end
|
149
|
+
|
150
|
+
it "should return nil if the mof file is not found" do
|
151
|
+
allow(File).to receive(:join) do |a, b|
|
152
|
+
[a,b].join("++")
|
153
|
+
end
|
154
|
+
allow(Dir).to receive(:entries).with("tmp++hello") {['f1', 'f2', 'f3']}
|
155
|
+
expect(conf_man.send(:find_configuration_document, 'hello')).to be_nil
|
156
|
+
end
|
157
|
+
end
|
158
|
+
|
159
|
+
describe "#configuration_code" do
|
160
|
+
it "should build dsc" do
|
161
|
+
dsc = conf_man.send(:configuration_code, 'archive{}', 'hello')
|
162
|
+
found_configuration = false
|
163
|
+
dsc.split(';').each do |command|
|
164
|
+
if command.downcase =~ /\s*configuration\s+'hello'\s*\{\s*node\s+'localhost'\s*\{\s*archive\s*\{\s*\}\s*\}\s*\}\s*/
|
165
|
+
found_configuration = true
|
166
|
+
end
|
167
|
+
end
|
168
|
+
expect(found_configuration).to be_true
|
169
|
+
end
|
170
|
+
end
|
171
|
+
end
|
@@ -0,0 +1,169 @@
|
|
1
|
+
#
|
2
|
+
# Author:: Bryan McLellan <btm@loftninjas.org>
|
3
|
+
# Copyright:: Copyright (c) 2014 Chef Software, 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/util/dsc/lcm_output_parser'
|
20
|
+
|
21
|
+
describe Chef::Util::DSC::LocalConfigurationManager::Parser do
|
22
|
+
context 'empty input parameter' do
|
23
|
+
it 'returns an empty array for a 0 length string' do
|
24
|
+
Chef::Util::DSC::LocalConfigurationManager::Parser::parse('').should be_empty
|
25
|
+
end
|
26
|
+
|
27
|
+
it 'returns an empty array for a nil input' do
|
28
|
+
Chef::Util::DSC::LocalConfigurationManager::Parser::parse('').should be_empty
|
29
|
+
end
|
30
|
+
end
|
31
|
+
|
32
|
+
context 'correctly formatted output from lcm' do
|
33
|
+
it 'returns an empty array for a log with no resources' do
|
34
|
+
str = <<EOF
|
35
|
+
logtype: [machinename]: LCM: [ Start Set ]
|
36
|
+
logtype: [machinename]: LCM: [ End Set ]
|
37
|
+
EOF
|
38
|
+
Chef::Util::DSC::LocalConfigurationManager::Parser::parse(str).should be_empty
|
39
|
+
end
|
40
|
+
|
41
|
+
it 'returns a single resource when only 1 logged with the correct name' do
|
42
|
+
str = <<EOF
|
43
|
+
logtype: [machinename]: LCM: [ Start Set ]
|
44
|
+
logtype: [machinename]: LCM: [ Start Resource ] [name]
|
45
|
+
logtype: [machinename]: LCM: [ End Resource ] [name]
|
46
|
+
logtype: [machinename]: LCM: [ End Set ]
|
47
|
+
EOF
|
48
|
+
resources = Chef::Util::DSC::LocalConfigurationManager::Parser::parse(str)
|
49
|
+
resources.length.should eq(1)
|
50
|
+
resources[0].name.should eq('[name]')
|
51
|
+
end
|
52
|
+
|
53
|
+
it 'identifies when a resource changes the state of the system' do
|
54
|
+
str = <<EOF
|
55
|
+
logtype: [machinename]: LCM: [ Start Set ]
|
56
|
+
logtype: [machinename]: LCM: [ Start Resource ] [name]
|
57
|
+
logtype: [machinename]: LCM: [ Start Set ] [name]
|
58
|
+
logtype: [machinename]: LCM: [ End Set ] [name]
|
59
|
+
logtype: [machinename]: LCM: [ End Resource ] [name]
|
60
|
+
logtype: [machinename]: LCM: [ End Set ]
|
61
|
+
EOF
|
62
|
+
resources = Chef::Util::DSC::LocalConfigurationManager::Parser::parse(str)
|
63
|
+
resources[0].changes_state?.should be_true
|
64
|
+
end
|
65
|
+
|
66
|
+
it 'preserves the log provided for how the system changed the state' do
|
67
|
+
str = <<EOF
|
68
|
+
logtype: [machinename]: LCM: [ Start Set ]
|
69
|
+
logtype: [machinename]: LCM: [ Start Resource ] [name]
|
70
|
+
logtype: [machinename]: LCM: [ Start Set ] [name]
|
71
|
+
logtype: [machinename]: [message]
|
72
|
+
logtype: [machinename]: LCM: [ End Set ] [name]
|
73
|
+
logtype: [machinename]: LCM: [ End Resource ] [name]
|
74
|
+
logtype: [machinename]: LCM: [ End Set ]
|
75
|
+
EOF
|
76
|
+
resources = Chef::Util::DSC::LocalConfigurationManager::Parser::parse(str)
|
77
|
+
resources[0].change_log.should match_array(["[name]","[message]","[name]"])
|
78
|
+
end
|
79
|
+
|
80
|
+
it 'should return false for changes_state?' do
|
81
|
+
str = <<EOF
|
82
|
+
logtype: [machinename]: LCM: [ Start Set ]
|
83
|
+
logtype: [machinename]: LCM: [ Start Resource ] [name]
|
84
|
+
logtype: [machinename]: LCM: [ Skip Set ] [name]
|
85
|
+
logtype: [machinename]: LCM: [ End Resource ] [name]
|
86
|
+
logtype: [machinename]: LCM: [ End Set ]
|
87
|
+
EOF
|
88
|
+
resources = Chef::Util::DSC::LocalConfigurationManager::Parser::parse(str)
|
89
|
+
resources[0].changes_state?.should be_false
|
90
|
+
end
|
91
|
+
|
92
|
+
it 'should return an empty array for change_log if changes_state? is false' do
|
93
|
+
str = <<EOF
|
94
|
+
logtype: [machinename]: LCM: [ Start Set ]
|
95
|
+
logtype: [machinename]: LCM: [ Start Resource ] [name]
|
96
|
+
logtype: [machinename]: LCM: [ Skip Set ] [name]
|
97
|
+
logtype: [machinename]: LCM: [ End Resource ] [name]
|
98
|
+
logtype: [machinename]: LCM: [ End Set ]
|
99
|
+
EOF
|
100
|
+
resources = Chef::Util::DSC::LocalConfigurationManager::Parser::parse(str)
|
101
|
+
resources[0].change_log.should be_empty
|
102
|
+
end
|
103
|
+
end
|
104
|
+
|
105
|
+
context 'Incorrectly formatted output from LCM' do
|
106
|
+
it 'should allow missing a [End Resource] when its the last one and still find all the resource' do
|
107
|
+
str = <<-EOF
|
108
|
+
logtype: [machinename]: LCM: [ Start Set ]
|
109
|
+
logtype: [machinename]: LCM: [ Start Resource ] [name]
|
110
|
+
logtype: [machinename]: LCM: [ Start Test ]
|
111
|
+
logtype: [machinename]: LCM: [ End Test ]
|
112
|
+
logtype: [machinename]: LCM: [ Skip Set ]
|
113
|
+
logtype: [machinename]: LCM: [ End Resource ]
|
114
|
+
logtype: [machinename]: LCM: [ Start Resource ] [name2]
|
115
|
+
logtype: [machinename]: LCM: [ Start Test ]
|
116
|
+
logtype: [machinename]: LCM: [ End Test ]
|
117
|
+
logtype: [machinename]: LCM: [ Start Set ]
|
118
|
+
logtype: [machinename]: LCM: [ End Set ]
|
119
|
+
logtype: [machinename]: LCM: [ End Set ]
|
120
|
+
EOF
|
121
|
+
|
122
|
+
resources = Chef::Util::DSC::LocalConfigurationManager::Parser::parse(str)
|
123
|
+
resources[0].changes_state?.should be_false
|
124
|
+
resources[1].changes_state?.should be_true
|
125
|
+
end
|
126
|
+
|
127
|
+
it 'should allow missing a [End Resource] when its the first one and still find all the resource' do
|
128
|
+
str = <<-EOF
|
129
|
+
logtype: [machinename]: LCM: [ Start Set ]
|
130
|
+
logtype: [machinename]: LCM: [ Start Resource ] [name]
|
131
|
+
logtype: [machinename]: LCM: [ Start Test ]
|
132
|
+
logtype: [machinename]: LCM: [ End Test ]
|
133
|
+
logtype: [machinename]: LCM: [ Skip Set ]
|
134
|
+
logtype: [machinename]: LCM: [ Start Resource ] [name2]
|
135
|
+
logtype: [machinename]: LCM: [ Start Test ]
|
136
|
+
logtype: [machinename]: LCM: [ End Test ]
|
137
|
+
logtype: [machinename]: LCM: [ Start Set ]
|
138
|
+
logtype: [machinename]: LCM: [ End Set ]
|
139
|
+
logtype: [machinename]: LCM: [ End Resource ]
|
140
|
+
logtype: [machinename]: LCM: [ End Set ]
|
141
|
+
EOF
|
142
|
+
|
143
|
+
resources = Chef::Util::DSC::LocalConfigurationManager::Parser::parse(str)
|
144
|
+
resources[0].changes_state?.should be_false
|
145
|
+
resources[1].changes_state?.should be_true
|
146
|
+
end
|
147
|
+
|
148
|
+
it 'should allow missing set and end resource and assume an unconverged resource in this case' do
|
149
|
+
str = <<-EOF
|
150
|
+
logtype: [machinename]: LCM: [ Start Set ]
|
151
|
+
logtype: [machinename]: LCM: [ Start Resource ] [name]
|
152
|
+
logtype: [machinename]: LCM: [ Start Test ]
|
153
|
+
logtype: [machinename]: LCM: [ End Test ]
|
154
|
+
logtype: [machinename]: LCM: [ Start Resource ] [name2]
|
155
|
+
logtype: [machinename]: LCM: [ Start Test ]
|
156
|
+
logtype: [machinename]: LCM: [ End Test ]
|
157
|
+
logtype: [machinename]: LCM: [ Start Set ]
|
158
|
+
logtype: [machinename]: LCM: [ End Set ]
|
159
|
+
logtype: [machinename]: LCM: [ End Resource ]
|
160
|
+
logtype: [machinename]: LCM: [ End Set ]
|
161
|
+
EOF
|
162
|
+
resources = Chef::Util::DSC::LocalConfigurationManager::Parser::parse(str)
|
163
|
+
resources[0].changes_state?.should be_true
|
164
|
+
resources[0].name.should eql('[name]')
|
165
|
+
resources[1].changes_state?.should be_true
|
166
|
+
resources[1].name.should eql('[name2]')
|
167
|
+
end
|
168
|
+
end
|
169
|
+
end
|
@@ -0,0 +1,139 @@
|
|
1
|
+
#
|
2
|
+
# Author:: Adam Edwards <adamed@getchef.com>
|
3
|
+
# Copyright:: Copyright (c) 2014 Chef Software, 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'
|
20
|
+
require 'chef/util/dsc/local_configuration_manager'
|
21
|
+
|
22
|
+
describe Chef::Util::DSC::LocalConfigurationManager do
|
23
|
+
|
24
|
+
let(:lcm) { Chef::Util::DSC::LocalConfigurationManager.new(nil, 'tmp') }
|
25
|
+
|
26
|
+
let(:normal_lcm_output) { <<-EOH
|
27
|
+
logtype: [machinename]: LCM: [ Start Set ]
|
28
|
+
logtype: [machinename]: LCM: [ Start Resource ] [name]
|
29
|
+
logtype: [machinename]: LCM: [ End Resource ] [name]
|
30
|
+
logtype: [machinename]: LCM: [ End Set ]
|
31
|
+
EOH
|
32
|
+
}
|
33
|
+
|
34
|
+
let(:no_whatif_lcm_output) { <<-EOH
|
35
|
+
Start-DscConfiguration : A parameter cannot be found\r\n that matches parameter name 'whatif'.
|
36
|
+
At line:1 char:123
|
37
|
+
+ run-somecommand -whatif
|
38
|
+
+ ~~~~~~~~
|
39
|
+
+ CategoryInfo : InvalidArgument: (:) [Start-DscConfiguration], ParameterBindingException
|
40
|
+
+ FullyQualifiedErrorId : NamedParameterNotFound,SomeCompany.SomeAssembly.Commands.RunSomeCommand
|
41
|
+
EOH
|
42
|
+
}
|
43
|
+
|
44
|
+
let(:dsc_resource_import_failure_output) { <<-EOH
|
45
|
+
PowerShell provider MSFT_xWebsite failed to execute Test-TargetResource functionality with error message: Please ensure that WebAdministration module is installed. + CategoryInfo : InvalidOperation: (:) [], CimException + FullyQualifiedErrorId : ProviderOperationExecutionFailure + PSComputerName : . PowerShell provider MSFT_xWebsite failed to execute Test-TargetResource functionality with error message: Please ensure that WebAdministration module is installed. + CategoryInfo : InvalidOperation: (:) [], CimException + FullyQualifiedErrorId : ProviderOperationExecutionFailure + PSComputerName : . The SendConfigurationApply function did not succeed. + CategoryInfo : NotSpecified: (root/Microsoft/...gurationManager:String) [], CimException + FullyQualifiedErrorId : MI RESULT 1 + PSComputerName : .
|
46
|
+
EOH
|
47
|
+
}
|
48
|
+
|
49
|
+
let(:lcm_status) {
|
50
|
+
double("LCM cmdlet status", :stderr => lcm_standard_error, :return_value => lcm_standard_output, :succeeded? => lcm_cmdlet_success)
|
51
|
+
}
|
52
|
+
|
53
|
+
describe 'test_configuration method invocation' do
|
54
|
+
context 'when interacting with the LCM using a PowerShell cmdlet' do
|
55
|
+
before(:each) do
|
56
|
+
allow(lcm).to receive(:run_configuration_cmdlet).and_return(lcm_status)
|
57
|
+
end
|
58
|
+
context 'that returns successfully' do
|
59
|
+
before(:each) do
|
60
|
+
allow(lcm).to receive(:run_configuration_cmdlet).and_return(lcm_status)
|
61
|
+
end
|
62
|
+
|
63
|
+
let(:lcm_standard_output) { normal_lcm_output }
|
64
|
+
let(:lcm_standard_error) { nil }
|
65
|
+
let(:lcm_cmdlet_success) { true }
|
66
|
+
|
67
|
+
it 'should successfully return resource information for normally formatted output when cmdlet the cmdlet succeeds' do
|
68
|
+
test_configuration_result = lcm.test_configuration('config')
|
69
|
+
expect(test_configuration_result.class).to be(Array)
|
70
|
+
expect(test_configuration_result.length).to be > 0
|
71
|
+
expect(Chef::Log).not_to receive(:warn)
|
72
|
+
end
|
73
|
+
end
|
74
|
+
|
75
|
+
context 'that fails due to missing what-if switch in DSC resource cmdlet implementation' do
|
76
|
+
let(:lcm_standard_output) { '' }
|
77
|
+
let(:lcm_standard_error) { no_whatif_lcm_output }
|
78
|
+
let(:lcm_cmdlet_success) { false }
|
79
|
+
|
80
|
+
it 'returns true when passed to #whatif_not_supported?' do
|
81
|
+
expect(lcm.send(:whatif_not_supported?, no_whatif_lcm_output)).to be_true
|
82
|
+
end
|
83
|
+
|
84
|
+
it 'should should return a (possibly empty) array of ResourceInfo instances' do
|
85
|
+
expect(Chef::Log).to receive(:warn)
|
86
|
+
expect(lcm).to receive(:whatif_not_supported?).and_call_original
|
87
|
+
test_configuration_result = nil
|
88
|
+
expect {test_configuration_result = lcm.test_configuration('config')}.not_to raise_error
|
89
|
+
expect(test_configuration_result.class).to be(Array)
|
90
|
+
end
|
91
|
+
end
|
92
|
+
|
93
|
+
context 'that fails due to a DSC resource not being imported before StartDSCConfiguration -whatif is executed' do
|
94
|
+
let(:lcm_standard_output) { '' }
|
95
|
+
let(:lcm_standard_error) { dsc_resource_import_failure_output }
|
96
|
+
let(:lcm_cmdlet_success) { false }
|
97
|
+
|
98
|
+
it 'should log a warning if the message is formatted as expected when a resource import failure occurs' do
|
99
|
+
expect(Chef::Log).to receive(:warn)
|
100
|
+
expect(lcm).to receive(:dsc_module_import_failure?).and_call_original
|
101
|
+
test_configuration_result = nil
|
102
|
+
expect {test_configuration_result = lcm.test_configuration('config')}.not_to raise_error
|
103
|
+
end
|
104
|
+
|
105
|
+
it 'should return a (possibly empty) array of ResourceInfo instances' do
|
106
|
+
expect(Chef::Log).to receive(:warn)
|
107
|
+
test_configuration_result = nil
|
108
|
+
expect {test_configuration_result = lcm.test_configuration('config')}.not_to raise_error
|
109
|
+
expect(test_configuration_result.class).to be(Array)
|
110
|
+
end
|
111
|
+
end
|
112
|
+
|
113
|
+
context 'that fails due to an unknown PowerShell cmdlet error' do
|
114
|
+
let(:lcm_standard_output) { 'some output' }
|
115
|
+
let(:lcm_standard_error) { 'Abort, Retry, Fail?' }
|
116
|
+
let(:lcm_cmdlet_success) { false }
|
117
|
+
|
118
|
+
it 'should log a warning' do
|
119
|
+
expect(Chef::Log).to receive(:warn)
|
120
|
+
expect(lcm).to receive(:dsc_module_import_failure?).and_call_original
|
121
|
+
expect {lcm.test_configuration('config')}.not_to raise_error
|
122
|
+
end
|
123
|
+
end
|
124
|
+
end
|
125
|
+
|
126
|
+
it 'should identify a correctly formatted error message as a resource import failure' do
|
127
|
+
expect(lcm.send(:dsc_module_import_failure?, dsc_resource_import_failure_output)).to be(true)
|
128
|
+
end
|
129
|
+
|
130
|
+
it 'should not identify an incorrectly formatted error message as a resource import failure' do
|
131
|
+
expect(lcm.send(:dsc_module_import_failure?, dsc_resource_import_failure_output.gsub('module', 'gibberish'))).to be(false)
|
132
|
+
end
|
133
|
+
|
134
|
+
it 'should not identify a message without a CimException reference as a resource import failure' do
|
135
|
+
expect(lcm.send(:dsc_module_import_failure?, dsc_resource_import_failure_output.gsub('CimException', 'ArgumentException'))).to be(false)
|
136
|
+
end
|
137
|
+
end
|
138
|
+
end
|
139
|
+
|