chef-server-api 0.9.18 → 0.10.0.beta.0

data/spec/unit/environments_controller_spec.rb

@@ -0,0 +1,139 @@
+#
+# Author:: Tim Hinderliter (<tim@opscode.com>)
+# Copyright:: Copyright (c) 2011 Opscode, Inc.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require File.expand_path(File.dirname(__FILE__) + '/../spec_model_helper')
+require 'chef/node'
+require 'pp'
+
+describe "Environments controller" do
+  before do
+    Merb.logger.set_log(StringIO.new)
+
+    @env1 = make_environment("env1")
+    
+    @filtered_cookbook_list_env1 = make_filtered_cookbook_hash(make_cookbook("cookbook1", "1.0.0"),
+                                                               make_cookbook("cookbook2", "1.0.0"))
+    @filtered_cookbook_list_env1["cookbook_noversions"] = Array.new
+
+    @filtered_cookbook_list_env2 = make_filtered_cookbook_hash(make_cookbook("cookbook1", "2.0.0"),
+                                                               make_cookbook("cookbook2", "2.0.0"))
+
+    @filtered_cookbook_list_env_many_versions = make_filtered_cookbook_hash(make_cookbook("cookbook1", "1.0.0"),
+                                                                            make_cookbook("cookbook1", "2.0.0"),
+                                                                            make_cookbook("cookbook1", "3.0.0"),
+                                                                            make_cookbook("cookbook1", "4.0.0"))
+
+    @cookbook_deps_on_nosuch = make_cookbook("cookbook_deps_on_nosuch", "1.0.0")
+    @cookbook_deps_on_nosuch.metadata.depends("cookbook_nosuch")
+
+    @cookbook_deps_on_badver = make_cookbook("cookbook_deps_on_badver", "1.0.0")
+    @cookbook_deps_on_badver.metadata.depends("cookbook1", ">= 3.0.0")
+  end
+
+  describe "when handling Environments API calls" do
+    it "should expand the passed-in run_list using the correct environment: one run_list item" do
+
+      # Env1 pins both versions at 1.0.0. Expect only the one we ask for, cookbook1,
+      # back in the result.
+      Chef::Environment.should_receive(:cdb_load_filtered_cookbook_versions).with("env1").and_return(@filtered_cookbook_list_env1)
+      response = post_json("/environments/env1/cookbook_versions", {"run_list" => ["recipe[cookbook1]"]})
+      response.should be_kind_of(Hash)
+      response.keys.size.should == 1
+      response["cookbook1"].should_not == nil
+      response["cookbook1"]['version'].should == "1.0.0"
+    end
+
+    it "should expect the passed-in run_list using the correct environment: two run_list items" do
+      # Ask for both cookbook1 and cookbook2 back. Expect version 2.0.0 for
+      # each, as those are what's appropriate for the environment.
+      Chef::Environment.should_receive(:cdb_load_filtered_cookbook_versions).with("env2").and_return(@filtered_cookbook_list_env2)
+      response = post_json("/environments/env2/cookbook_versions", {"run_list" => ["recipe[cookbook2]", "recipe[cookbook1]"]})
+      response.should be_kind_of(Hash)
+      response.keys.size.should == 2
+      response["cookbook1"].should_not == nil
+      response["cookbook1"]['version'].should == "2.0.0"
+      response["cookbook2"].should_not == nil
+      response["cookbook2"]['version'].should == "2.0.0"
+    end
+
+    it "should return the newest version of a cookbook when given multiple versions" do
+      Chef::Environment.should_receive(:cdb_load_filtered_cookbook_versions).with("env_many_versions").and_return(@filtered_cookbook_list_env_many_versions)
+      response = post_json("/environments/env_many_versions/cookbook_versions", {"run_list" => ["recipe[cookbook1]"]})
+
+      response.should be_kind_of(Hash)
+      response.keys.size.should == 1
+      response["cookbook1"].should_not == nil
+      response["cookbook1"]['version'].should == "4.0.0"
+    end
+
+    it "should return the asked-for, older version of a cookbook if the version is specified in the run_list" do
+      Chef::Environment.should_receive(:cdb_load_filtered_cookbook_versions).with("env_many_versions").and_return(@filtered_cookbook_list_env_many_versions)
+      response = post_json("/environments/env_many_versions/cookbook_versions", {"run_list" => ["recipe[cookbook1@1.0.0]"]})
+
+      response.should be_kind_of(Hash)
+      response.keys.size.should == 1
+      response["cookbook1"].should_not == nil
+      response["cookbook1"]['version'].should == "1.0.0"
+    end
+
+    it "should report no_such_cookbook if given a dependency on a non-existant cookbook" do
+      Chef::Environment.should_receive(:cdb_load_filtered_cookbook_versions).with("env1").and_return(@filtered_cookbook_list_env1)
+      expected_error = {
+        "message" => "Run list contains invalid items: no such cookbook cookbook_nosuch.",
+        "non_existent_cookbooks" => ["cookbook_nosuch"],
+        "cookbooks_with_no_versions" => []
+      }.to_json
+
+      lambda {
+        response = post_json("/environments/env1/cookbook_versions", {"run_list" => ["recipe[cookbook_nosuch]"]})
+      }.should raise_error(Merb::ControllerExceptions::PreconditionFailed, expected_error)
+    end
+
+    it "should report no_such_version if given a dependency on a cookbook that doesn't have any valid versions for an environment" do
+      Chef::Environment.should_receive(:cdb_load_filtered_cookbook_versions).with("env1").and_return(@filtered_cookbook_list_env1)
+      expected_error = {
+        "message" => "Run list contains invalid items: no versions match the constraints on cookbook cookbook_noversions.",
+        "non_existent_cookbooks" => [],
+        "cookbooks_with_no_versions" => ["cookbook_noversions"]
+      }.to_json
+
+      lambda {
+        response = post_json("/environments/env1/cookbook_versions", {"run_list" => ["recipe[cookbook_noversions]"]})
+      }.should raise_error(Merb::ControllerExceptions::PreconditionFailed, expected_error)
+    end
+
+    # TODO; have top-level cookbooks depend on other, non-existent cookbooks,
+    # to get the other kind of exceptions.
+    it "should report multiple failures (compound exceptions) if there is more than one error in dependencies" do
+      Chef::Environment.should_receive(:cdb_load_filtered_cookbook_versions).with("env1").and_return(@filtered_cookbook_list_env1)
+
+      expected_error = {
+        "message" => "Run list contains invalid items: no such cookbooks cookbook_nosuch_1, cookbook_nosuch_2; no versions match the constraints on cookbook cookbook_noversions.",
+        "non_existent_cookbooks" => ["cookbook_nosuch_1", "cookbook_nosuch_2"],
+        "cookbooks_with_no_versions" => ["cookbook_noversions"]
+      }.to_json
+
+      lambda {
+        response = post_json("/environments/env1/cookbook_versions", 
+                             {"run_list" => ["recipe[cookbook_nosuch_1]", "recipe[cookbook_nosuch_2]", "recipe[cookbook_noversions]"]})
+      }.should raise_error(Merb::ControllerExceptions::PreconditionFailed, expected_error)
+    end
+  end
+end
+

data/spec/unit/nodes_controller_environments_spec.rb

@@ -0,0 +1,132 @@
+#
+# Author:: Tim Hinderliter (<tim@opscode.com>)
+# Copyright:: Copyright (c) 2011 Opscode, Inc.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require File.expand_path(File.dirname(__FILE__) + '/../spec_model_helper')
+require 'chef/node'
+require 'pp'
+
+describe "Nodes controller - environments and run_list expansion" do
+  before do
+    Merb.logger.set_log(StringIO.new)
+
+    # Node 'node1':
+    #  contains 'role[role1]'
+    #
+    # Role 'role1':
+    #  for env '_default', contains 'recipe[cb_for_default]'
+    #  for env 'env1', contains 'recipe[cb_for_env1]'
+    #  for env 'env_fallback', contains nothing (should fall back to _default).
+    #
+    # Check that the node returns the right expanded run list no matter the
+    # environment it's in.
+    @node1 = make_node("node1")
+    @node1.run_list << "role[role1]"
+
+    @node_containing_nosuch_cookbook = make_node("node_containing_nosuch_cookbook")
+    @node_containing_nosuch_cookbook.run_list << "recipe[cookbook_nosuch]"
+
+    @node_containing_role_containing_nosuch_cookbook = make_node("node_containing_role_containing_nosuch_cookbook")
+    @node_containing_role_containing_nosuch_cookbook.run_list << "role[role_containing_nosuch_cookbook]"
+
+    @role1 = make_role("role1")
+    @role1.env_run_lists({"_default" => make_runlist("recipe[cb_for_default]"), "env1" => make_runlist("recipe[cb_for_env1]")})
+
+    @role_containing_nosuch_cookbook = make_role("role_containing_nosuch_cookbook")
+    @role_containing_nosuch_cookbook.env_run_lists({"_default" => make_runlist("recipe[cookbook_nosuch]")})
+
+    @all_filtered_cookbook_list = 
+      make_filtered_cookbook_hash(make_cookbook("cb_for_default", "1.0.0"),
+                                  make_cookbook("cb_for_env1", "1.0.0"))
+  end
+
+  describe "when handling Node API calls" do
+    it "should expand role and cookbook dependencies using the _default environment" do
+      # Test that node@_default resolves to use cookbook cb_for_default
+      Chef::Node.should_receive(:cdb_load).with("node1").and_return(@node1)
+      Chef::Role.should_receive(:cdb_load).with("role1", nil).and_return(@role1)
+      Chef::Environment.should_receive(:cdb_load_filtered_cookbook_versions).with("_default").and_return(@all_filtered_cookbook_list)
+
+      response = get_json("/nodes/node1/cookbooks")
+      response.should be_kind_of(Hash)
+      response["cb_for_default"].should_not == nil
+      response["cb_for_env1"].should == nil
+    end
+
+    it "should expand role and cookbook dependencies using the env1 environment" do
+      # Test that node@env1 resolves to use cookbook cb_for_env1
+      @node1.chef_environment("env1")
+      Chef::Node.should_receive(:cdb_load).with("node1").and_return(@node1)
+      Chef::Role.should_receive(:cdb_load).with("role1", nil).and_return(@role1)
+      Chef::Environment.should_receive(:cdb_load_filtered_cookbook_versions).with("env1").and_return(@all_filtered_cookbook_list)
+
+      response = get_json("/nodes/node1/cookbooks")
+      response.should be_kind_of(Hash)
+      response["cb_for_default"].should == nil
+      response["cb_for_env1"].should_not == nil
+    end
+
+    it "should expand role and cookbook dependencies using the _default environment, when passed an empty environment" do
+      # Test that node@env_fallback resolves to use cookbook cb_for_default
+      # because env_fallback falls back to _default
+      @node1.chef_environment("env_fallback")
+      Chef::Node.should_receive(:cdb_load).with("node1").and_return(@node1)
+      Chef::Role.should_receive(:cdb_load).with("role1", nil).and_return(@role1)
+      Chef::Environment.should_receive(:cdb_load_filtered_cookbook_versions).with("env_fallback").and_return(@all_filtered_cookbook_list)
+
+      response = get_json("/nodes/node1/cookbooks")
+      response.should be_kind_of(Hash)
+      response["cb_for_default"].should_not == nil
+      response["cb_for_env1"].should == nil
+    end
+
+    it "should throw the proper exception when a node's run_list contains a non-existent cookbook" do
+      expected_error = {
+        "message" => "Run list contains invalid items: no such cookbook cookbook_nosuch.",
+        "non_existent_cookbooks" => ["cookbook_nosuch"],
+        "cookbooks_with_no_versions" => []
+      }.to_json
+
+      Chef::Node.should_receive(:cdb_load).with("node_containing_nosuch_cookbook").and_return(@node_containing_nosuch_cookbook)
+      Chef::Environment.should_receive(:cdb_load_filtered_cookbook_versions).with("_default").and_return(@all_filtered_cookbook_list)
+
+      lambda {
+        response = get_json("/nodes/node_containing_nosuch_cookbook/cookbooks")
+      }.should raise_error(Merb::ControllerExceptions::PreconditionFailed, expected_error)
+    end
+
+
+    it "should throw the proper exception when a node's run_list contains a role that contains a non-existent cookbook" do
+      expected_error = {
+        "message" => "Run list contains invalid items: no such cookbook cookbook_nosuch.",
+        "non_existent_cookbooks" => ["cookbook_nosuch"],
+        "cookbooks_with_no_versions" => []
+      }.to_json
+
+      Chef::Node.should_receive(:cdb_load).with("node_containing_role_containing_nosuch_cookbook").and_return(@node_containing_role_containing_nosuch_cookbook)
+      Chef::Role.should_receive(:cdb_load).with("role_containing_nosuch_cookbook", nil).and_return(@role_containing_nosuch_cookbook)
+      Chef::Environment.should_receive(:cdb_load_filtered_cookbook_versions).with("_default").and_return(@all_filtered_cookbook_list)
+
+      lambda {
+        response = get_json("/nodes/node_containing_role_containing_nosuch_cookbook/cookbooks")
+      }.should raise_error(Merb::ControllerExceptions::PreconditionFailed, expected_error)
+    end
+
+  end
+end
+

data/spec/unit/nodes_controller_spec.rb

@@ -0,0 +1,81 @@
+#
+# Author:: Tim Hinderliter (<tim@opscode.com>)
+# Copyright:: Copyright (c) 2011 Opscode, Inc.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require File.expand_path(File.dirname(__FILE__) + '/../spec_model_helper')
+require 'chef/node'
+require 'pp'
+
+describe "Nodes controller" do
+  before do
+    Merb.logger.set_log(StringIO.new)
+  end
+
+  describe "when handling Node API calls" do
+    it "returns a list of nodes" do
+      returned_node_list = ["node1", "node2"]
+      Chef::Node.stub!(:cdb_list).and_return(returned_node_list)
+
+      res = get_json("/nodes")
+
+      expected_response = returned_node_list.inject({}) do |res,node_name|
+        res[node_name] = "#{root_url}/#{node_name}"
+        res
+      end
+      res.should == expected_response
+    end
+
+    it "returns an existing node" do
+      returned_node = make_node("node1")
+      Chef::Node.stub!(:cdb_load).and_return(returned_node)
+
+      response = get_json("/nodes/node1")
+      response.name.should == returned_node.name
+    end
+
+    it "returns a 404 when a non-existant node is shown" do
+      Chef::Node.should_receive(:cdb_load).with("node1").and_raise(Chef::Exceptions::CouchDBNotFound)
+
+      lambda {
+        get_json("/nodes/node1")
+      }.should raise_error(Merb::ControllerExceptions::NotFound)
+    end
+
+    it "creates a node if no same-named node exists" do
+      create_node = make_node("node1")
+      
+      Chef::Node.should_receive(:cdb_load).with("node1").and_raise(Chef::Exceptions::CouchDBNotFound)
+      create_node.should_receive(:cdb_save)
+
+      response = post_json("/nodes", create_node)
+      response.should == {"uri" => "#{root_url}/nodes/node1"}
+    end
+
+    it "raises a Conflict if you create a node whose name already exists" do
+      create_node = make_node("node1")
+      existing_node = make_node("node1")
+
+      Chef::Node.should_receive(:cdb_load).with("node1").and_return(existing_node)
+
+      lambda {
+        post_json("/nodes", create_node)
+      }.should raise_error(Merb::ControllerExceptions::Conflict)
+    end
+  end
+end
+

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: chef-server-api
 version: !ruby/object:Gem::Version 
-  prerelease: 
-  version: 0.9.18
+  prerelease: 7
+  version: 0.10.0.beta.0
 platform: ruby
 authors: 
 - Opscode
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-29 00:00:00 -07:00
+date: 2011-03-28 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -69,8 +69,19 @@ dependencies:
   prerelease: false
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: json
+  name: dep_selector
   requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.0.3
+  type: :runtime
+  prerelease: false
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: json
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -81,10 +92,10 @@ dependencies:
         version: 1.4.6
   type: :runtime
   prerelease: false
-  version_requirements: *id006
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: uuidtools
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -92,10 +103,10 @@ dependencies:
         version: 2.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *id007
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   name: thin
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -103,7 +114,18 @@ dependencies:
         version: "0"
   type: :runtime
   prerelease: false
-  version_requirements: *id008
+  version_requirements: *id009
+- !ruby/object:Gem::Dependency 
+  name: dep_selector
+  requirement: &id010 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :runtime
+  prerelease: false
+  version_requirements: *id010
 description: A systems integration framework, built to bring the benefits of configuration management to your entire infrastructure.
 email: chef@opscode.com
 executables: 
@@ -127,12 +149,17 @@ files:
 - lib/chef-server-api.rb
 - spec/spec.opts
 - spec/spec_helper.rb
+- spec/spec_model_helper.rb
+- spec/unit/environments_controller_spec.rb
+- spec/unit/nodes_controller_environments_spec.rb
+- spec/unit/nodes_controller_spec.rb
 - spec/unit/sandbox_file_spec.rb
 - app/controllers/application.rb
 - app/controllers/clients.rb
 - app/controllers/cookbooks.rb
 - app/controllers/data_bags.rb
 - app/controllers/data_item.rb
+- app/controllers/environments.rb
 - app/controllers/exceptions.rb
 - app/controllers/main.rb
 - app/controllers/nodes.rb
@@ -140,6 +167,7 @@ files:
 - app/controllers/sandboxes.rb
 - app/controllers/search.rb
 - app/controllers/users.rb
+- app/helpers/cookbook_version_helper.rb
 - app/helpers/tarball_helper.rb
 - app/models/sandbox_file.rb
 - app/views/exceptions/bad_request.json.erb
@@ -147,8 +175,8 @@ files:
 - app/views/exceptions/not_acceptable.html.haml
 - app/views/exceptions/not_found.html.erb
 - app/views/exceptions/standard_error.html.erb
-- app/views/layout/chef_server_api.html.haml
-- app/views/main/index.html.haml
+- app/views/layout/application.html.erb
+- app/views/main/index.html.erb
 - public/images/avatar.png
 - public/images/indicator.gif
 - public/images/merb.jpg
@@ -183,9 +211,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      version: "0"
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: