chef-server-api 0.9.0.a4 → 0.9.0.a6

data/app/controllers/cookbooks.rb

@@ -19,8 +19,8 @@
 # limitations under the License.
 #
 
-require 'chef' / 'cookbook_loader'
-require 'chef' / 'cookbook' / 'metadata'
+require 'chef/cookbook_loader'
+require 'chef/cookbook/metadata'
 
 class Cookbooks < Application
   
@@ -40,13 +40,33 @@ class Cookbooks < Application
   include Merb::TarballHelper
   
   def index
-    cookbook_list = Chef::CookbookVersion.cdb_list
+    cookbook_list = Chef::CookbookVersion.cdb_list_latest.keys.sort
     response = Hash.new
-    cookbook_list.each do |cookbook_name|
-      cookbook_name =~ /^(.+)-(\d+\.\d+\.\d+)$/
-      response[$1] = absolute_url(:cookbook, :cookbook_name => $1)
+    cookbook_list.map! do |cookbook_name|
+      response[cookbook_name] = absolute_url(:cookbook, :cookbook_name => cookbook_name)
     end
-    display response 
+    display response
+  end
+
+  #FIXME: this is different from the rest of our API, but in a useful way...
+  def index_latest
+    cookbook_list = Chef::CookbookVersion.cdb_list_latest(true)
+    response = Hash.new
+    cookbook_list.map! do |cookbook_name, cookbook_version|
+      response[cookbook_name]={ :url=>absolute_url(:cookbook, :cookbook_name => cookbook_name, :cookbook_version => cookbook_version),
+                                :cookbook_name => cookbook_name, :cookbook_version=>cookbook_version}
+    end
+    display response
+  end
+
+  def index_recipes #FIXME: is this cool to do w/ access control on platform?
+    all_cookbooks = Array(Chef::CookbookVersion.cdb_list_latest(true))
+    all_cookbooks.map! do |cookbook|
+      cookbook.manifest["recipes"].map { |r| "#{cookbook.name}::#{r['name']}" }
+    end
+    all_cookbooks.flatten!
+    all_cookbooks.sort!
+    display all_cookbooks
   end
 
   def show_versions

data/app/controllers/sandboxes.rb

@@ -88,27 +88,14 @@ class Sandboxes < Application
   end
   
   def upload_checksum
-    sandbox_guid = params[:sandbox_id]
-    checksum = params[:checksum]
+    sandbox_file = ChefServerApi::SandboxFile.new(self.request.env["rack.input"], params)
+    raise BadRequest, sandbox_file.error  if sandbox_file.invalid_params?
+    raise NotFound, sandbox_file.error    if sandbox_file.invalid_sandbox?
+    raise BadRequest, sandbox_file.error  if sandbox_file.invalid_file?
     
-    existing_sandbox = Chef::Sandbox.cdb_load(sandbox_guid)
-    raise NotFound, "cannot find sandbox with guid #{sandbox_guid}" unless existing_sandbox  
-    raise NotFound, "checksum #{checksum} isn't a part of sandbox #{sandbox_guid}" unless existing_sandbox.checksums.member?(checksum)
-
-    Tempfile.open("sandbox") do |src|
-      src.write(self.request.env["rack.input"].string) 
-      src.close
-
-      observed_checksum = Chef::Cache::Checksum.generate_md5_checksum_for_file(src.path)
-      
-      raise BadRequest, "Checksum did not match: expected #{checksum}, observed #{observed_checksum}" unless observed_checksum == checksum
-    
-      dest = sandbox_checksum_location(sandbox_guid, checksum)
-      Chef::Log.info("upload_checksum: move #{src} to #{dest}")
-      FileUtils.mv(src.path, dest)
-    end
+    sandbox_file.commit_to(sandbox_checksum_location(sandbox_file.sandbox_id, sandbox_file.expected_checksum))
     
-    url = absolute_url(:sandbox_checksum, :sandbox_id => sandbox_guid, :checksum => checksum)
+    url = absolute_url(:sandbox_checksum, sandbox_file.resource_params)
     result = { 'uri' => url }
     display result
   end

data/app/models/sandbox_file.rb

@@ -0,0 +1,117 @@
+#
+# Author:: Daniel DeLeo (<dan@opscode.com>)
+# Copyright:: Copyright (c) 2010 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 'chef/sandbox'
+require 'chef/exceptions'
+require 'chef/cache/checksum'
+
+module ChefServerApi
+  class SandboxFile
+    attr_reader :sandbox_id
+    attr_reader :expected_checksum
+    attr_reader :error
+
+    def initialize(input, params={})
+      @input = input
+      @sandbox_id = params[:sandbox_id]
+      @expected_checksum = params[:checksum]
+      @sandbox_loaded = false
+      @error = nil
+    end
+
+    def resource_params
+      {:sandbox_id => sandbox_id, :checksum => expected_checksum}
+    end
+
+    def sandbox
+      unless @sandbox_loaded
+        load_sandbox
+        @sandbox_loaded = true
+      end
+      @sandbox
+    end
+
+    def commit_to(destination_file_path)
+      if @input.respond_to?(:path) && @input.path
+        commit_tempfile_to(destination_file_path)
+      else
+        commit_stringio_to(destination_file_path)
+      end
+    end
+
+    def actual_checksum
+      @actual_checksum ||= begin
+        @input.rewind
+        Chef::Cache::Checksum.instance.generate_md5_checksum(@input)
+      end
+    end
+
+    def invalid_file?
+      if expected_checksum != actual_checksum
+        @error = "Uploaded file is invalid: expected a md5 sum '#{expected_checksum}', but it was '#{actual_checksum}'"
+      else
+        false
+      end
+    end
+
+    def invalid_params?
+      if @sandbox_id.nil?
+        @error = "Cannot upload file with checksum '#{expected_checksum}': you must provide a sandbox_id"
+      elsif @expected_checksum.nil?
+        @error = "Cannot upload file to sandbox '#{sandbox_id}': you must provide the file's checksum"
+      else
+        false
+      end
+    end
+
+    def invalid_sandbox?
+      if sandbox.nil?
+        @error = "Cannot find sandbox with id '#{sandbox_id}' in the database"
+      elsif !sandbox.member?(@expected_checksum)
+        @error = "Cannot upload file: checksum '#{expected_checksum}' isn't a part of sandbox '#{sandbox_id}'"
+      else
+        false
+      end
+    end
+
+    private
+
+    def load_sandbox
+      @sandbox = Chef::Sandbox.cdb_load(@sandbox_id)
+    rescue Chef::Exceptions::CouchDBNotFound
+      @sandbox = nil
+    end 
+
+    def commit_stringio_to(destination_file_path)
+      Tempfile.open("sandbox") do |src|
+        src.write(@input.string) 
+        src.close
+        Chef::Log.info("upload_checksum: move #{src.path} to #{destination_file_path}")
+        FileUtils.mv(src.path, destination_file_path)
+      end
+    end
+
+    def commit_tempfile_to(destination_file_path)
+      Chef::Log.debug("Sandbox file provided as tempfile: #{@input.inspect}")
+      Chef::Log.info("upload_checksum: move #{@input.path} to #{destination_file_path}")
+      FileUtils.mv(@input.path, destination_file_path)
+    end
+
+  end
+  
+end

data/config/router.rb

@@ -31,6 +31,8 @@ Merb::Router.prepare do
         :method => 'get'
         ).to(:controller => "cookbooks", :action => "index")
 
+  match("/cookbooks/_recipes", :method=>'get').to(:controller=>'cookbooks',:action=>'index_recipes')
+
   match("/cookbooks/:cookbook_name/:cookbook_version",
         :method => 'put',
         :cookbook_name => /[\w\.]+/,

data/lib/chef-server-api/version.rb

@@ -1,3 +1,3 @@
 module ChefServerApi
-  VERSION = '0.9.0.a4'
+  VERSION = '0.9.0.a6'
 end

data/spec/spec.opts

@@ -0,0 +1,3 @@
+-c
+-b
+-fs

data/spec/spec_helper.rb

@@ -0,0 +1,6 @@
+require 'rubygems'
+$:.unshift File.expand_path(File.dirname(__FILE__) + '/../app')
+$:.unshift File.expand_path(File.dirname(__FILE__) + '/../lib')
+$:.unshift File.expand_path(File.dirname(__FILE__) + '/../../chef/lib')
+
+require 'chef'

data/spec/unit/sandbox_file_spec.rb

@@ -0,0 +1,135 @@
+#
+# Author:: Daniel DeLeo (<dan@opscode.com>)
+# Copyright:: Copyright (c) 2010 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 'models/sandbox_file'
+
+describe ChefServerApi::SandboxFile do
+  before do
+    @input = StringIO.new
+    @params = {:sandbox_id => '1234', :checksum => '2342'}
+    @sandbox_file = ChefServerApi::SandboxFile.new(@input, @params)
+  end
+
+  describe "when first created" do
+    it "gets a sandbox guid from the parameters" do
+      @sandbox_file.sandbox_id.should == '1234'
+    end
+
+    it "gets a checksum from the provided parameters" do
+      @sandbox_file.expected_checksum.should == '2342'
+    end
+
+    it "returns the parameters that idendify the resource in the api" do
+      @sandbox_file.resource_params.should == {:sandbox_id => '1234', :checksum => '2342'}
+    end
+
+    it "loads an existing sandbox from couchdb" do
+      Chef::Sandbox.should_receive(:cdb_load).with('1234').once.and_return(:ohai2u)
+      @sandbox_file.sandbox.should == :ohai2u
+      @sandbox_file.sandbox.should == :ohai2u
+    end
+
+    # BadRequest in the controller
+    it "is invalid if no sandbox_id is given" do
+      @params.delete(:sandbox_id)
+      sandbox_file = ChefServerApi::SandboxFile.new(@input, @params)
+      sandbox_file.invalid_params?.should_not be_false
+      sandbox_file.invalid_params?.should == "Cannot upload file with checksum '2342': you must provide a sandbox_id"
+    end
+
+    # BadRequest in the controller
+    it "is invalid if no expected checksum is given" do
+      @params.delete(:checksum)
+      sandbox_file = ChefServerApi::SandboxFile.new(@input, @params)
+      sandbox_file.invalid_params?.should_not be_false
+      sandbox_file.invalid_params?.should == "Cannot upload file to sandbox '1234': you must provide the file's checksum"
+    end
+
+    it "considers the params valid when both the checksum and sandbox_id are provided" do
+      @sandbox_file.invalid_params?.should be_false
+    end
+
+    # NotFound in the controller
+    it "is invalid if the provided sandbox_id doesn't exist in the database" do
+      err = Chef::Exceptions::CouchDBNotFound.new "Cannot find sandbox 1234 in CouchDB!"
+      Chef::Sandbox.should_receive(:cdb_load).with('1234').once.and_raise(err)
+      @sandbox_file.invalid_sandbox?.should == "Cannot find sandbox with id '1234' in the database"
+    end
+
+    # NotFound in the controller
+    it "is invalid if the sandbox exists, but the given checksum isn't a member of it" do
+      sandbox = Chef::Sandbox.new('1234')
+      sandbox.checksums << 'not-2342'
+      Chef::Sandbox.should_receive(:cdb_load).with('1234').once.and_return(sandbox)
+      @sandbox_file.invalid_sandbox?.should == "Cannot upload file: checksum '2342' isn't a part of sandbox '1234'"
+    end
+
+    it "is valid when the sandbox exists and the checksum is a member of it" do
+      sandbox = Chef::Sandbox.new('1234')
+      sandbox.checksums << '2342'
+      Chef::Sandbox.should_receive(:cdb_load).with('1234').once.and_return(sandbox)
+      @sandbox_file.invalid_sandbox?.should be_false
+    end
+    
+  end
+
+  context "when created with valid parameters and a valid sandbox" do
+    before do
+      @sandbox = Chef::Sandbox.new('1234')
+      @sandbox_file.stub!(:sandbox).and_return(@sandbox)
+      @input.string.replace("riseofthemachines\nriseofthechefs\n")
+    end
+
+    it "checksums the uploaded data" do
+      @sandbox_file.actual_checksum.should == '0e157ac1e2dd73191b76067fb6b4bceb'
+    end
+
+    # BadRequest in the controller
+    it "considers the uploaded file invalid if its checksum doesn't match" do
+      message = "Uploaded file is invalid: expected a md5 sum '2342', but it was '0e157ac1e2dd73191b76067fb6b4bceb'"
+      @sandbox_file.invalid_file?.should == message
+    end
+
+    it "is valid if the expected and actual checksums match" do
+      @sandbox_file.expected_checksum.replace('0e157ac1e2dd73191b76067fb6b4bceb')
+      @sandbox_file.invalid_file?.should be_false
+    end
+
+    context "and a string io for input" do
+      it "writes the StringIO's contents to a tempfile, then moves it into place" do
+        @tempfile = StringIO.new
+        @tempfile.stub!(:path).and_return("/tmpfile/source")
+        Tempfile.should_receive(:open).with("sandbox").and_yield(@tempfile)
+        FileUtils.should_receive(:mv).with("/tmpfile/source", "/tmp/final_home")
+        @sandbox_file.commit_to('/tmp/final_home')
+        @tempfile.string.should == "riseofthemachines\nriseofthechefs\n"
+      end
+    end
+
+    context "and a tempfile for input" do
+      it "moves the tempfile into place" do
+        @input.stub!(:path).and_return('/existing/tempfile')
+        FileUtils.should_receive(:mv).with("/existing/tempfile", "/tmp/final_home")
+        @sandbox_file.commit_to('/tmp/final_home')
+      end
+    end
+    
+  end
+
+end

metadata

@@ -6,8 +6,8 @@ version: !ruby/object:Gem::Version
   - 0
   - 9
   - 0
-  - a4
-  version: 0.9.0.a4
+  - a6
+  version: 0.9.0.a6
 platform: ruby
 authors: 
 - Opscode
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-04 00:00:00 -07:00
+date: 2010-06-07 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -155,6 +155,9 @@ files:
 - config/router.rb
 - lib/chef-server-api/version.rb
 - lib/chef-server-api.rb
+- spec/spec.opts
+- spec/spec_helper.rb
+- spec/unit/sandbox_file_spec.rb
 - app/controllers/application.rb
 - app/controllers/clients.rb
 - app/controllers/cookbooks.rb
@@ -168,6 +171,7 @@ files:
 - app/controllers/search.rb
 - app/controllers/users.rb
 - app/helpers/tarball_helper.rb
+- app/models/sandbox_file.rb
 - app/views/exceptions/bad_request.json.erb
 - app/views/exceptions/internal_server_error.html.erb
 - app/views/exceptions/not_acceptable.html.haml