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

data/app/controllers/roles.rb

@@ -48,11 +48,7 @@ class Roles < Application
       raise NotFound, "Cannot load role #{params[:id]}"
     end
 
-    @role.description(params["inflated_object"].description)
-    @role.recipes(params["inflated_object"].recipes) if defined?(params["inflated_object"].recipes)
-    @role.run_list(params["inflated_object"].run_list)
-    @role.default_attributes(params["inflated_object"].default_attributes)
-    @role.override_attributes(params["inflated_object"].override_attributes)
+    @role.update_from!(params["inflated_object"])
     @role.cdb_save
     self.status = 200
     @role.couchdb_rev = nil
@@ -70,4 +66,26 @@ class Roles < Application
     display @role
   end
 
+  # GET /roles/:id/environments/:env_id
+  def environment
+    begin
+      @role = Chef::Role.cdb_load(params[:role_id])
+    rescue Chef::Exceptions::CouchDBNotFound => e
+      raise NotFound, "Cannot load role #{params[:role_id]}"
+    end
+    display("run_list" => @role.env_run_lists[params[:env_id]])
+  end
+  
+  # GET /roles/:id/environments
+  def environments
+    begin
+      @role = Chef::Role.cdb_load(params[:role_id])
+    rescue Chef::Exceptions::CouchDBNotFound => e
+      raise NotFound, "Cannot load role #{params[:role_id]}"
+    end
+    
+    display(@role.env_run_lists.keys.sort)
+  end
+  
+
 end

data/app/controllers/search.rb

@@ -17,7 +17,7 @@
 # limitations under the License.
 
 
-require 'chef/solr/query'
+require 'chef/solr_query'
 
 class Search < Application
   provides :json
@@ -27,34 +27,24 @@ class Search < Application
 
   def index
     indexes = valid_indexes
-    display(indexes.inject({}) { |r,i| r[i] = absolute_url(:search, i); r })
+    display(indexes.inject({}) { |r,i| r[i] = absolute_url(:search_show, i); r })
   end
 
   def valid_indexes
     indexes = Chef::DataBag.cdb_list(false)
-    indexes += %w{ role node client }
+    indexes += %w{ role node client environment}
   end
 
   def show
     unless valid_indexes.include?(params[:id])
       raise NotFound, "I don't know how to search for #{params[:id]} data objects."
     end
-
-    query = Chef::Solr::Query.new(Chef::Config[:solr_url])
-    params[:q]     ||= "*:*"
-    params[:sort]  ||= nil
-    params[:start] ||= 0
-    params[:rows]  ||= 20
-    objects, start, total = query.search(params[:id], params[:q], params[:sort], params[:start], params[:rows])
-    display({
-      "rows" => objects,
-      "start" => start,
-      "total" => total
-    })
+    params[:type] = params.delete(:id)
+    display(Chef::SolrQuery.from_params(params).search)
   end
 
   def reindex
-    display(Chef::Solr.new.rebuild_index)
+    display(Chef::SolrQuery.new.rebuild_index)
   end
 
 end

data/app/helpers/cookbook_version_helper.rb

@@ -0,0 +1,72 @@
+#
+# Author:: Stephen Delano (<stephen@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.
+#
+
+module Merb
+  module CookbookVersionHelper
+
+    include Merb::ControllerExceptions
+
+    # takes a cookbook_name and an array of versions and returns a hash
+    # params:
+    # - cookbook_name: the name of the cookbook
+    # - versions: a sorted list of version strings
+    #
+    # returns:
+    # {
+    #   :url => http://url,
+    #   :versions => [
+    #     { :version => version, :url => http://url/version },
+    #     { :version => version, :url => http://url/version }
+    #   ]  
+    # }
+    def expand_cookbook_urls(cookbook_name, versions, num_versions)
+      versions = versions[0...num_versions.to_i] unless num_versions == "all"
+      version_list = versions.inject([]) do |res, version|
+        res.push({ 
+          :url => absolute_url(:cookbook_version, :cookbook_name => cookbook_name, :cookbook_version => version),
+          :version => version
+        })
+        res
+      end
+      url = absolute_url(:cookbook, :cookbook_name => cookbook_name)
+      {:url => url, :versions => version_list}
+    end
+
+    # validate and return the number of versions requested
+    # by the user
+    #
+    # raises an exception if an invalid number is requested
+    #
+    # params:
+    # - default: the number of versions to default to
+    #
+    # valid num_versions query parameter:
+    # - an integer >= 0
+    # - the string "all"
+    def num_versions!(default="1")
+      input = params[:num_versions]
+      result = if input
+                 valid_input = (input == "all" || Integer(input) >= 0) rescue false
+                 raise BadRequest, "You have requested an invalid number of versions (x >= 0 || 'all')" unless valid_input
+                 input
+               else
+                 default
+               end
+    end
+  end
+end

data/app/views/layout/application.html.erb

@@ -0,0 +1,49 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta content='text/html; charset=utf-8' http-equiv='content-type' />
+    <title>Chef Server</title>
+    <link href="/stylesheets/base.css" type="text/css" rel="Stylesheet" charset="utf-8" media="all" />
+    <link href="/stylesheets/themes/djime-cerulean/style.css" type="text/css" rel="Stylesheet" charset="utf-8" media="all" />
+    <link href="/stylesheets/chef.css" type="text/css" rel="Stylesheet" charset="utf-8" media="all" />
+  </head>
+  <body>
+    <div id='container'>
+      <div id='header'>
+        <h1><a href="<%= absolute_url(:top) -%>">Chef REST API</a></h1>
+      </div>
+      <div id='main-navigation'>
+        <div class='clear'></div>
+      </div>
+      <div id='wrapper'>
+        <div id='main'>
+          <div class='block' id='block-text'>
+            <div class='content'>
+              <h2 class='title'>The REST API</h2>
+              <div class='inner'>
+                This is the Chef API Server. 
+                <% if @webui_url %>
+                  <a href="<%= @webui_url -%>">Are you looking for the Web UI?</a>
+                <% end %>
+              </div>
+              <div class='inner'>
+                For more information about Chef, head on over to the <a href="http://wiki.opscode.com/">wiki.</a>
+              </div>
+            </div>
+          </div>
+          <div id='footer'>
+            <div class='block'>
+              <p>Copyright &copy; 2009-2011 Opscode, Inc.</p>
+            </div>
+          </div>
+        </div>
+        <div id='sidebar'>
+          <div class='block notice' id='sidebar_block_notice'></div>
+          <div class='block' id='sidebar_block'></div>
+        </div>
+        <div class='clear'></div>
+      </div>
+    </div>
+  </body>
+</html>

data/bin/chef-server

@@ -25,6 +25,7 @@ require "merb-core"
 
 # Load chef and chef-server-api from source rather than gem, if present
 $:.unshift(File.expand_path(File.dirname(__FILE__) + '/../../chef/lib/'))
+$:.unshift(File.expand_path(File.dirname(__FILE__) + '/../../chef-solr/lib/'))
 $:.unshift(File.expand_path(File.dirname(__FILE__) + '/../lib'))
 
 # Print the version if we have -v or --version

data/config/init.rb

@@ -38,8 +38,10 @@ require 'chef/data_bag_item'
 require 'chef/cookbook_version'
 require 'chef/sandbox'
 require 'chef/checksum'
+require 'chef/environment'
 require 'chef/monkey_patches/regexp'
 
+
 require 'mixlib/authentication'
 
 Mixlib::Authentication::Log.logger = Ohai::Log.logger = Chef::Log.logger
@@ -72,6 +74,7 @@ unless Merb::Config.environment == "test"
   Chef::CookbookVersion.create_design_document
   Chef::Sandbox.create_design_document
   Chef::Checksum.create_design_document
+  Chef::Environment.create_design_document
 
   # Create the signing key and certificate
   Chef::Certificate.generate_signing_ca
@@ -82,6 +85,9 @@ unless Merb::Config.environment == "test"
   # Generate the Web UI Key
   Chef::Certificate.gen_validation_key(Chef::Config[:web_ui_client_name], Chef::Config[:web_ui_key], true)
 
+  # Create the '_default' Environment
+  Chef::Environment.create_default_environment
+
   Chef::Log.info('Loading roles')
   Chef::Role.sync_from_disk_to_couchdb
 end

data/config/rack.rb

@@ -19,5 +19,8 @@
 # Correctly set a content length.
 use Rack::ContentLength
 
+# Serve assets for the html page from /public
+use Merb::Rack::Static, Merb.dir_for(:public)
+
 # this is our main merb application
 run Merb::Rack::Application.new

data/config/router.rb

@@ -27,7 +27,20 @@ Merb::Router.prepare do
         :method => 'get').
     to(:controller => "nodes", :action => "cookbooks")
   # Roles
-  resources :roles
+  resources :roles do |r|
+    r.match('/environments', :method => 'get').to(:controller => "roles", :action => "environments")
+    r.match('/environments/:env_id', :method => 'get').to(:controller=>"roles", :action=>"environment")
+  end
+
+  # Environments
+  resources :environments do |e|
+    e.match("/cookbooks", :method => "get").to(:controller=>"environments", :action=>"list_cookbooks")
+    e.match("/cookbooks/:cookbook_id", :method => "get").to(:controller=>"environments", :action=>"cookbook")
+    e.match("/recipes", :method => "get").to(:controller=>"environments", :action=>"list_recipes")
+    e.match("/nodes", :method => "get").to(:controller=>"environments", :action=>"list_nodes")
+    e.match("/roles/:role_id", :method => "get").to(:controller=>"environments", :action => "role")
+    e.match("/cookbook_versions", :method => "post").to(:controller=>"environments", :action=>"cookbook_versions_for_run_list")
+  end
 
   # Status
   match("/status").to(:controller => "status", :action => "index").name(:status)
@@ -40,7 +53,9 @@ Merb::Router.prepare do
   match("/clients/:id", :id => /[\w\.-]+/, :method=>"delete").to(:controller=>'clients', :action=>'destroy')
 
   # Search
-  resources :search
+  #resources :search
+  match('/search', :method => 'get').to(:controller => 'search', :action => 'index').name(:search)
+  match('/search/:id', :method => 'get').to(:controller => 'search', :action => 'show').name(:search_show)
   match('/search/reindex', :method => 'post').to(:controller => "search", :action => "reindex")
 
   # Cookbooks
@@ -48,9 +63,7 @@ Merb::Router.prepare do
 
   match("/cookbooks",
         :method => 'get'
-        ).to(:controller => "cookbooks", :action => "index")
-
-  match("/cookbooks/_latest", :method=>'get').to(:controller=>'cookbooks',:action=>'index_latest')
+        ).to(:controller => "cookbooks", :action => "index").name(:cookbooks)
 
   match("/cookbooks/_recipes", :method=>'get').to(:controller=>'cookbooks',:action=>'index_recipes')
 
@@ -120,10 +133,10 @@ Merb::Router.prepare do
         @json_params ||= begin
           if Merb::Const::JSON_MIME_TYPE_REGEXP.match(content_type)
             begin
-              # Call Chef's JSON utility instead of the default in Merb, 
+              # Call Chef's JSON utility instead of the default in Merb,
               # JSON.parse.
               jobj = Chef::JSONCompat.from_json(raw_post)
-              jobj = jobj.to_mash if jobj.is_a?(Hash)
+              jobj = Mash.from_hash(jobj) if jobj.is_a?(Hash)
             rescue JSON::ParserError
               jobj = Mash.new
             end

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

@@ -1,3 +1,3 @@
 module ChefServerApi
-  VERSION = '0.9.18'
+  VERSION = '0.10.0.beta.0'
 end

data/spec/spec_helper.rb

@@ -1,6 +1,83 @@
-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')
+#
+# 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 "rubygems"
+require "merb-core"
+require "rspec"
+
+Merb.push_path(:spec_helpers, "spec" / "spec_helpers", "**/*.rb")
+Merb.push_path(:spec_fixtures, "spec" / "fixtures", "**/*.rb")
+
+Merb.start_environment(:testing => true, :adapter => 'runner', :environment => ENV['MERB_ENV'] || 'test')
+
+RSpec.configure do |config|
+  config.include(Merb::Test::RouteHelper)
+  config.include(Merb::Test::ControllerHelper)
+end
+
+def get_json(path, params = {}, env = {}, &block)
+  request_json("GET", path, params, env, &block)
+end
+
+def post_json(path, post_body, env = {}, &block)
+  request_json("POST", path, {}, env) do |controller|
+    # Merb FakeRequest allows me no way to pass JSON across the
+    # FakeRequest/StringIO boundary, so we hack it here.
+    if post_body.is_a?(Hash)
+      controller.params.merge!(post_body)
+    else
+      controller.params['inflated_object'] = post_body
+    end
+    block.call if block
+  end
+end
+
+# Make an HTTP call of <method>, assign the accept header to
+# application/json, and return the JSON-parsed output.
+#
+# Side effects:
+#  Raw textual output available in @response_raw
+#  Controller used available in @controller
+def request_json(method, path, params, env, &block)
+  @controller = mock_request(path, params, env.merge({'HTTP_ACCEPT' => "application/json", :request_method => method})) do |controller|
+    stub_authentication(controller)
+    block.call(controller) if block
+  end
+
+  @response_raw = @controller.body
+  @response_json = Chef::JSONCompat.from_json(@response_raw)
+end
+
+def stub_authentication(controller)
+  username = "tester"
+
+  user = Chef::ApiClient.new
+  user.name(username)
+  user.admin(true)
+
+  # authenticate_every has a side-effect of setting @auth_user
+  controller.stub!(:authenticate_every).and_return(true)
+  controller.instance_variable_set(:@auth_user, user)
+end
+
+def root_url
+  # include organization name to run these tests in the platform
+  "http://localhost"
+end
+
 
-require 'chef'

data/spec/spec_model_helper.rb

@@ -0,0 +1,67 @@
+#
+# 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.
+#
+
+# Set of methods to create model objects for spec tests.
+# None of these methods save or otherwise commit the objects they
+# create; they simply initialize the respective model object and
+# set its name (and other important attributes, where appropriate).
+
+def make_node(name)
+  res = Chef::Node.new
+  res.name(name)
+  res
+end
+
+def make_role(name)
+  res = Chef::Role.new
+  res.name(name)
+  res
+end
+
+def make_environment(name)
+  res = Chef::Environment.new
+  res.name(name)
+  res
+end
+
+def make_cookbook(name, version)
+  res = Chef::CookbookVersion.new(name)
+  res.version = version
+  res
+end
+
+def make_runlist(*items)
+  res = Chef::RunList.new
+  items.each do |item|
+    res << item
+  end
+  res
+end
+
+# Take an Array of cookbook_versions,
+# And return a hash like:
+# {
+#   "cookbook_name" => [CookbookVersion, CookbookVersion],
+# }
+def make_filtered_cookbook_hash(*array_cookbook_versions)
+  array_cookbook_versions.inject({}) do |res, cookbook_version|
+    res[cookbook_version.name] ||= Array.new
+    res[cookbook_version.name] << cookbook_version
+    res
+  end
+end