@@ -25,7 +25,6 @@ class ChefServerApi::Cookbooks < ChefServerApi::Application provides :json before :authenticate_every - before :is_admin include Chef::Mixin::Checksum chef-server-api/app/controllers/cookbooks.rb @@ -25,7 +25,7 @@ class ChefServerApi::Nodes < ChefServerApi::Application before :authenticate_every before :fix_up_node_id - before :is_correct_node, :only => [ :create, :update, :destroy, :cookbooks ] + before :is_correct_node, :only => [ :update, :destroy, :cookbooks ] def index @node_list = Chef::Node.cdb_list chef-server-api/app/controllers/nodes.rb @@ -65,24 +65,26 @@ if defined?(Merb::Plugins) end Chef::Nanite.in_event { Chef::Log.info("Nanite is ready") } - # create the couch design docs for nodes, roles, and databags - Chef::CouchDB.new.create_id_map - Chef::Node.create_design_document - Chef::Role.create_design_document - Chef::DataBag.create_design_document - Chef::ApiClient.create_design_document + unless Merb::Config.environment == "test" + # create the couch design docs for nodes, roles, and databags + Chef::CouchDB.new.create_id_map + Chef::Node.create_design_document + Chef::Role.create_design_document + Chef::DataBag.create_design_document + Chef::ApiClient.create_design_document - Chef::Log.info('Loading roles') - Chef::Role.sync_from_disk_to_couchdb + Chef::Log.info('Loading roles') + Chef::Role.sync_from_disk_to_couchdb - # Create the signing key and certificate - Chef::Certificate.generate_signing_ca + # Create the signing key and certificate + Chef::Certificate.generate_signing_ca - # Generate the validation key - Chef::Certificate.gen_validation_key + # Generate the validation key + Chef::Certificate.gen_validation_key - # Generate the Web UI Key - Chef::Certificate.gen_validation_key(Chef::Config[:web_ui_client_name], Chef::Config[:web_ui_key]) + # Generate the Web UI Key + Chef::Certificate.gen_validation_key(Chef::Config[:web_ui_client_name], Chef::Config[:web_ui_key]) + end end end chef-server-api/lib/chef-server-api.rb @@ -4,8 +4,10 @@ require 'chef' Chef::Config.from_file(File.join("/etc", "chef", "server.rb")) -Merb::Config.setup(:merb_root => File.expand_path(File.dirname(__FILE__)), - :environment => ENV['RACK_ENV'], :init_file => File.dirname(__FILE__) / "config/init.rb") +Merb::Config.setup(:merb_root => File.expand_path(File.dirname(__FILE__)), + :environment => ENV['RACK_ENV'], + :fork_for_class_load => false, + :init_file => File.dirname(__FILE__) / "config/init.rb") Merb.environment = Merb::Config[:environment] Merb.root = Merb::Config[:merb_root] Merb::BootLoader.run chef-server/config.ru @@ -4,11 +4,7 @@ require 'rake/rdoctask' require './tasks/rspec.rb' GEM = "chef" -<<<<<<< HEAD:chef/Rakefile CHEF_VERSION = "0.8.0" -======= -CHEF_VERSION = "0.7.12" ->>>>>>> 6f78b9ff0026b1784375a8baf8076c0cc210c946:chef/Rakefile AUTHOR = "Adam Jacob" EMAIL = "adam@opscode.com" HOMEPAGE = "http://wiki.opscode.com/display/chef" @@ -27,14 +23,7 @@ spec = Gem::Specification.new do |s| s.homepage = HOMEPAGE s.add_dependency "mixlib-config", ">= 1.0.12" -<<<<<<< HEAD:chef/Rakefile %w{mixlib-cli mixlib-log mixlib-authentication json erubis extlib ohai amqp thor ruby-hmac}.each { |gem| s.add_dependency gem } -======= - s.add_dependency "ohai", ">= 0.3.4" - %w{mixlib-cli mixlib-log ruby-openid - json erubis extlib - stomp}.each { |gem| s.add_dependency gem } ->>>>>>> 6f78b9ff0026b1784375a8baf8076c0cc210c946:chef/Rakefile s.bindir = "bin" s.executables = %w( chef-client chef-solo knife ) chef/Rakefile @@ -283,21 +283,6 @@ class Chef @run_list.detect { |r| r == item } ? true : false end - # Set an attribute based on the missing method. If you pass an argument, we'll use that - # to set the attribute values. Otherwise, we'll wind up just returning the attributes - # value. - def method_missing(symbol, *args) - if args.length != 0 - @attribute[symbol] = args.length == 1 ? args[0] : args - else - if @attribute.has_key?(symbol) - @attribute[symbol] - else - raise ArgumentError, "Attribute #{symbol.to_s} is not defined!" - end - end - end - # Transform the node to a Hash def to_hash index_hash = @attribute chef/lib/chef/node.rb @@ -111,8 +111,8 @@ class Chef self end - def expand(from='server', couchdb=nil) - couchdb = couchdb ? couchdb : Chef::CouchDB.new + def expand(from='server') + couchdb = Chef::CouchDB.new recipes = Array.new default_attrs = Mash.new override_attrs = Mash.new @@ -133,13 +133,17 @@ class Chef role = r.get_rest("roles/#{name}") elsif from == 'couchdb' # Load the role from couchdb - role = Chef::Role.cdb_load(name, couchdb) + role = Chef::Role.cdb_load(name) end role.recipes.each { |r| recipes << r unless recipes.include?(r) } default_attrs = Chef::Mixin::DeepMerge.merge(default_attrs, role.default_attributes) override_attrs = Chef::Mixin::DeepMerge.merge(override_attrs, role.override_attributes) end end + Chef::Log.error("****\n\n\n") + Chef::Log.error(default_attrs) + Chef::Log.error(override_attrs) + Chef::Log.error("****\n\n\n") return recipes, default_attrs, override_attrs end chef/lib/chef/run_list.rb @@ -111,7 +111,7 @@ class Chef run_action(resource, ra) end rescue => e - Chef::Log.error("#{resource} (#{resource.source_line}) had an error:\n#{e}\n#{e.backtrace}") + Chef::Log.error("#{resource} (#{resource.source_line}) had an error:\n#{e}\n#{e.backtrace.join("\n")}") raise e unless resource.ignore_failure end end chef/lib/chef/runner.rb @@ -327,7 +327,8 @@ describe Chef::Node do it "should create if it cannot update" do @node.name("monkey") - @rest.should_receive(:put_rest).and_raise(Net::HTTPServerException.new(1, 3)) + exception = mock("404 error", :code => "404") + @rest.should_receive(:put_rest).and_raise(Net::HTTPServerException.new("foo", exception)) @rest.should_receive(:post_rest).with("nodes", @node) @node.save end chef/spec/unit/node_spec.rb @@ -129,7 +129,7 @@ describe Chef::Provider::Git do "b7d19519a1c15f1c1a324e2683bd728b6198ce5a\trefs/tags/0.7.8^{}\n"+ "ebc1b392fe7e8f0fbabc305c299b4d365d2b4d9b\trefs/tags/chef-server-package" @resource.revision '' - @stdout.stub(:string).and_return(lots_of_shas) + @stdout.stub!(:string).and_return(lots_of_shas) @provider.should_receive(:popen4).and_yield("pid","stdin",@stdout,@stderr).and_return(@exitstatus) @provider.revision_sha.should eql("28af684d8460ba4793eda3e7ac238c864a5d029a") end @@ -231,4 +231,4 @@ describe Chef::Provider::Git do @provider.action_export end -end \ No newline at end of file +end chef/spec/unit/provider/git_spec.rb @@ -147,7 +147,7 @@ describe Chef::RunList do Chef::Role.stub!(:from_disk).and_return(@role) Chef::Role.stub!(:load).and_return(@role) - @rest = mock("Chef::REST", { :get_rest => @role }) + @rest = mock("Chef::REST", { :get_rest => @role, :url => "/" }) Chef::REST.stub!(:new).and_return(@rest) @run_list << "role[stubby]" @@ -175,7 +175,7 @@ describe Chef::RunList do describe "from couchdb" do it "should load the role from couchdb" do - Chef::Role.should_receive(:load) + Chef::Role.should_receive(:cdb_load).and_return(@role) @run_list.expand("couchdb") end end chef/spec/unit/run_list_spec.rb @@ -8,7 +8,7 @@ Feature: List clients via the REST API Given a 'registration' named 'bobo' exists And there are no clients When I 'GET' the path '/clients' - Then the inflated response should be '2' items long + Then the inflated response should be '3' items long Scenario: List clients when one has been created Given a 'registration' named 'bobo' exists features/api/clients/list_clients_api.feature @@ -17,8 +17,4 @@ Feature: List cookbooks via the REST API When I 'GET' the path '/cookbooks' using a wrong private key Then I should get a '401 "Unauthorized"' exception - Scenario: List cookbooks when I am not an admin - Given a 'registration' named 'not_admin' exists - When I 'GET' the path '/cookbooks' - Then I should get a '401 "Unauthorized"' exception features/api/cookbooks/list_cookbooks_api.feature @@ -26,8 +26,4 @@ Feature: Show a cookbook via the REST API When I 'GET' the path '/cookbooks/show_cookbook' using a wrong private key Then I should get a '401 "Unauthorized"' exception - Scenario: Show a cookbook with as a non-administrator - Given a 'registration' named 'not_admin' exists - When I 'GET' the path '/cookbooks/show_cookbook' - Then I should get a '401 "Unauthorized"' exception features/api/cookbooks/show_cookbook_api.feature @@ -19,8 +19,3 @@ Feature: Show a cookbooks attribute files via the REST API When I 'GET' the path '/cookbooks/show_cookbook/attributes' using a wrong private key Then I should get a '401 "Unauthorized"' exception - Scenario: Show a cookbooks attribute files as a non-admin - Given a 'registration' named 'not_admin' exists - When I 'GET' the path '/cookbooks/show_cookbook/attributes' - Then I should get a '401 "Unauthorized"' exception - features/api/cookbooks/show_cookbook_attributes_api.feature @@ -23,9 +23,3 @@ Feature: Create a node via the REST API When I 'POST' the 'node' to the path '/nodes' using a wrong private key Then I should get a '401 "Unauthorized"' exception - Scenario: Create a new node as when I am not an admin - Given a 'registration' named 'not_admin' exists - And a 'node' named 'webserver' - When I 'POST' the 'node' to the path '/nodes' - Then I should get a '401 "Unauthorized"' exception - features/api/nodes/create_node_api.feature @@ -14,4 +14,4 @@ "ossining": "whatever", "snakes": "on a plane" } -} \ No newline at end of file +} features/data/roles/role_test.json @@ -56,7 +56,7 @@ When /^I run the chef\-client for '(.+)' seconds$/ do |run_for| end When /^I run the chef\-client at log level '(.+)'$/ do |log_level| - @log_level = log_level + @log_level = log_level.to_sym When "I run the chef-client" end @@ -76,11 +76,17 @@ log_location File.join(tmpdir, "silly-monkey.log") file_cache_path File.join(tmpdir, "cache") ssl_verify_mode :verify_none registration_url "http://127.0.0.1:4000" -openid_url "http://127.0.0.1:4001" +openid_url "http://127.0.0.1:4000" template_url "http://127.0.0.1:4000" remotefile_url "http://127.0.0.1:4000" search_url "http://127.0.0.1:4000" -couchdb_database 'chef' +role_url "http://127.0.0.1:4000" +client_url "http://127.0.0.1:4000" +chef_server_url "http://127.0.0.1:4000" +validation_client_name "validator" +systmpdir = File.expand_path(File.join(Dir.tmpdir, "chef_integration")) +validation_key File.join(systmpdir, "validation.pem") +client_key File.join(systmpdir, "client.pem") CONFIG @config_file = File.expand_path(File.join(File.dirname(__FILE__), '..', 'data', 'config', 'client-with-logging.rb')) @@ -91,7 +97,7 @@ CONFIG self.cleanup_files << @config_file - @status = Chef::Mixin::Command.popen4("#{File.join(File.dirname(__FILE__), "..", "..", "chef", "bin", "chef-client")} -l #{@log_level} -c #{@config_file} #{@chef_args}") do |p, i, o, e| + @status = Chef::Mixin::Command.popen4("#{File.join(File.dirname(__FILE__), "..", "..", "chef", "bin", "chef-client")} -c #{@config_file} #{@chef_args}") do |p, i, o, e| @stdout = o.gets(nil) @stderr = e.gets(nil) end features/steps/run_client_steps.rb @@ -1,5 +1,3 @@ -# -# Author:: Adam Jacob (<adam@opscode.com>) # Copyright:: Copyright (c) 2008 Opscode, Inc. # License:: Apache License, Version 2.0 # @@ -88,6 +86,7 @@ def create_databases Chef::Certificate.gen_validation_key Chef::Certificate.gen_validation_key(Chef::Config[:web_ui_client_name], Chef::Config[:web_ui_key]) system("cp #{File.join(Dir.tmpdir, "chef_integration", "validation.pem")} #{Dir.tmpdir}") + system("cp #{File.join(Dir.tmpdir, "chef_integration", "webui.pem")} #{Dir.tmpdir}") end def prepare_replicas @@ -101,8 +100,19 @@ def cleanup if File.exists?(Chef::Config[:validation_key]) File.unlink(Chef::Config[:validation_key]) end + if File.exists?(Chef::Config[:web_ui_key]) + File.unlink(Chef::Config[:web_ui_key]) + end end +Merb.start_environment( + :merb_root => File.join(File.dirname(__FILE__), "..", "..", "chef-server"), + :testing => true, + :adapter => 'runner', + :environment => ENV['MERB_ENV'] || 'test', + :session_store => 'memory' +) + ### # Pre-testing setup ### @@ -113,14 +123,6 @@ delete_databases create_databases prepare_replicas -Merb.start_environment( - :merb_root => File.join(File.dirname(__FILE__), "..", "..", "chef-server"), - :testing => true, - :adapter => 'runner', - :environment => ENV['MERB_ENV'] || 'test', - :session_store => 'memory' -) - Spec::Runner.configure do |config| config.include(Merb::Test::ViewHelper) config.include(Merb::Test::RouteHelper) @@ -171,6 +173,7 @@ World(ChefWorld) Before do system("mkdir -p #{tmpdir}") system("cp -r #{File.join(Dir.tmpdir, "validation.pem")} #{File.join(tmpdir, "validation.pem")}") + system("cp -r #{File.join(Dir.tmpdir, "webui.pem")} #{File.join(tmpdir, "webui.pem")}") Chef::CouchDB.new(Chef::Config[:couchdb_url], "chef_integration").create_db c = Chef::REST.new(Chef::Config[:couchdb_url], nil, nil) c.post_rest("_replicate", { features/support/env.rb 19db05a58855537bef42f660907a5e788b7855a3 Adam Jacob adam@opscode.com http://github.com/opscode/chef/commit/2f85186fcc8979c089e44104eb463625ba362d27 2f85186fcc8979c089e44104eb463625ba362d27 2009-10-19T22:54:06-07:00 2009-10-19T22:54:06-07:00 Fixes for 0.7.12->0.8 merge, tests pass 853c4e88663c01ce9e593af1915d36501fdebaec Adam Jacob adam@opscode.com