chef-zero 4.3.2 → 4.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ac78b39c39c21f9ec236e084f3cced3e9fede287
-  data.tar.gz: 1c0e8b64a786743b5be5911d96fe02bfdb1efb59
+  metadata.gz: ef05ae4a7aef9de3c3a3da1ec5fbd5143a1a0457
+  data.tar.gz: 01e350ee9b6ff42d42550e8bafa07e1de7d1d629
 SHA512:
-  metadata.gz: e8957ed6a69e8e3f1f28a5fcbafc114f1013d4e2e35f83ba71cc4050780da5f829a69de6dac9c93a77b4594e3c48019f86e524b0de5555b0fbe1f7700748279f
-  data.tar.gz: 295f5763b15e6167a106beffbf175436d2d89975a3a90b60e7a714ff3176b1d3a8c2d65bed01f758b2412e574e547fb4678d76988abf34cfd51a1c15572149e3
+  metadata.gz: ac2bff1a5f4518d05262d3660ad96709ec60f495706bd0700d4084cdc1a6e14cca17a458a69067bf5da9a14024c7222a17e0bb8de2a582205d9ebe0acbd560e6
+  data.tar.gz: 727e1693591ff8b7e7c03c3fd9b0e57868429fe9c1286b8b59cb65850d54b8d90cf54e6bc2a9c4353c1f1cff5081e7853400be21ef50ac1cd98b0bc2ff63a1cb

data/Gemfile

@@ -0,0 +1,14 @@
+source 'https://rubygems.org'
+gemspec
+
+gem 'rest-client', :github => 'chef/rest-client'
+
+gem 'oc-chef-pedant', :github => 'chef/chef-server'
+
+# gem 'oc-chef-pedant', :path => "../chef-server"
+
+# bundler resolve failure on "rspec_junit_formatter"
+# gem 'chef-pedant', :github => 'opscode/chef-pedant', :ref => "server-cli-option"
+
+gem 'chef', :github => 'chef/chef'
+# gem 'chef', :path => "../chef"

data/Rakefile

@@ -15,6 +15,18 @@ task :pedant do
   require File.expand_path('spec/run_oc_pedant')
 end
 
+desc "run pedant with CHEF_FS set"
+task :cheffs do
+  ENV['CHEF_FS'] = "yes"
+  require File.expand_path('spec/run_oc_pedant')
+end
+
+desc "run pedant with FILE_STORE set"
+task :filestore do
+  ENV['FILE_STORE'] = "yes"
+  require File.expand_path('spec/run_oc_pedant')
+end
+
 desc "run oc pedant"
 task :oc_pedant do
   require File.expand_path('spec/run_oc_pedant')

data/bin/chef-zero

@@ -55,6 +55,11 @@ OptionParser.new do |opts|
     options[:log_file] = value
   end
 
+  opts.on("--enterprise", "Whether to run in enterprise mode") do |value|
+    options[:single_org] = nil
+    options[:osc_compat] = false
+  end
+
   opts.on("--multi-org", "Whether to run in multi-org mode") do |value|
     options[:single_org] = nil
   end

data/chef-zero.gemspec

@@ -0,0 +1,33 @@
+$:.unshift(File.dirname(__FILE__) + '/lib')
+require 'chef_zero/version'
+
+Gem::Specification.new do |s|
+  s.name = 'chef-zero'
+  s.version = ChefZero::VERSION
+  s.platform = Gem::Platform::RUBY
+  s.summary = 'Self-contained, easy-setup, fast-start in-memory Chef server for testing and solo setup purposes'
+  s.description = s.summary
+  s.author = 'John Keiser'
+  s.email = 'jkeiser@opscode.com'
+  s.homepage = 'http://www.opscode.com'
+  s.license = 'Apache 2.0'
+
+  s.add_dependency 'mixlib-log',    '~> 1.3'
+  s.add_dependency 'hashie',        '>= 2.0', '< 4.0'
+  s.add_dependency 'uuidtools', '~> 2.1'
+  s.add_dependency 'ffi-yajl', '~> 2.2'
+  s.add_dependency 'rack'
+
+  s.add_development_dependency 'pry'
+  s.add_development_dependency 'pry-byebug'
+  s.add_development_dependency 'pry-stack_explorer'
+  s.add_development_dependency 'rake'
+  s.add_development_dependency 'rspec'
+  s.add_development_dependency 'github_changelog_generator'
+
+  s.bindir       = 'bin'
+  s.executables  = ['chef-zero']
+  s.require_path = 'lib'
+  s.files = %w(LICENSE README.md Gemfile Rakefile) + Dir.glob('*.gemspec') +
+      Dir.glob('{lib,spec}/**/*', File::FNM_DOTMATCH).reject {|f| File.directory?(f) }
+end

data/lib/chef_zero/chef_data/data_normalizer.rb

@@ -79,7 +79,8 @@ module ChefZero
         data_bag_item
       end
 
-      def self.normalize_cookbook(endpoint, org_prefix, cookbook, name, version, base_uri, method)
+      def self.normalize_cookbook(endpoint, org_prefix, cookbook, name, version, base_uri, method,
+                                  is_cookbook_artifact=false)
         # TODO I feel dirty
         if method != 'PUT'
           cookbook.each_pair do |key, value|
@@ -92,24 +93,28 @@ module ChefZero
             end
           end
           cookbook['name'] ||= "#{name}-#{version}"
-          # TODO this feels wrong, but the real chef server doesn't expand this default
-    #      cookbook['version'] ||= version
-          cookbook['cookbook_name'] ||= name
+          # TODO it feels wrong, but the real chef server doesn't expand 'version', so we don't either.
+
           cookbook['frozen?'] ||= false
           cookbook['metadata'] ||= {}
           cookbook['metadata']['version'] ||= version
-          # Sad to not be expanding defaults just because Chef doesn't :(
-  #        cookbook['metadata']['name'] ||= name
-  #        cookbook['metadata']['description'] ||= "A fabulous new cookbook"
+
+          # defaults set by the client and not the Server:
+          # metadata[name, description, maintainer, maintainer_email, license]
+
           cookbook['metadata']['long_description'] ||= ""
-  #        cookbook['metadata']['maintainer'] ||= "YOUR_COMPANY_NAME"
-  #        cookbook['metadata']['maintainer_email'] ||= "YOUR_EMAIL"
-  #        cookbook['metadata']['license'] ||= "none"
           cookbook['metadata']['dependencies'] ||= {}
           cookbook['metadata']['attributes'] ||= {}
           cookbook['metadata']['recipes'] ||= {}
         end
-        cookbook['json_class'] ||= 'Chef::CookbookVersion'
+
+        if is_cookbook_artifact
+          cookbook.delete('json_class')
+        else
+          cookbook['cookbook_name'] ||= name
+          cookbook['json_class'] ||= 'Chef::CookbookVersion'
+        end
+
         cookbook['chef_type'] ||= 'cookbook_version'
         if method == 'MIN'
           cookbook['metadata'].delete('attributes')
@@ -166,6 +171,20 @@ module ChefZero
         node
       end
 
+      def self.normalize_policy(policy, name, revision)
+        policy['name'] ||= name
+        policy['revision_id'] ||= revision
+        policy['run_list'] ||= []
+        policy['cookbook_locks'] ||= {}
+        policy
+      end
+
+      def self.normalize_policy_group(policy_group, name)
+        policy_group[name] ||= 'name'
+        policy_group['policies'] ||= {}
+        policy_group
+      end
+
       def self.normalize_organization(org, name)
         org['name'] ||= name
         org['full_name'] ||= name

data/lib/chef_zero/chef_data/default_creator.rb

@@ -155,6 +155,8 @@ module ChefZero
           'checksums' => {}
         },
         'nodes' => {},
+        'policies' => {},
+        'policy_groups' => {},
         'roles' => {},
         'sandboxes' => {},
         'users' => {},
@@ -378,11 +380,12 @@ module ChefZero
           # Non-default containers do not get superusers added to them,
           # because reasons.
           unless path.size == 4 && path[0] == 'organizations' && path[2] == 'containers' && !exists?(path)
-            owners |= superusers
+            owners += superusers
           end
         end
 
-        owners.uniq
+        # we don't de-dup this list, because pedant expects to see ["pivotal", "pivotal"] in some cases.
+        owners
       end
 
       def default_acl(acl_path, acl={})

data/lib/chef_zero/endpoints/cookbook_artifacts_cookbook_endpoint.rb

@@ -0,0 +1,24 @@
+require 'chef_zero/chef_data/data_normalizer'
+
+module ChefZero
+  module Endpoints
+    class CookbookArtifactsCookbookEndpoint < RestBase
+      # GET /organizations/ORG/cookbook_artifacts/COOKBOOK
+      def get(request)
+        cookbook_name = request.rest_path.last
+        cookbook_url = build_uri(request.base_uri, request.rest_path)
+        response_data = {}
+        versions = []
+
+        list_data(request).each do |identifier|
+          artifact_url = build_uri(request.base_uri, request.rest_path + [cookbook_name, identifier])
+          versions << { url: artifact_url, identifier: identifier }
+        end
+
+        response_data[cookbook_name] = { url: cookbook_url, versions: versions }
+
+        return json_response(200, response_data)
+      end
+    end
+  end
+end

data/lib/chef_zero/endpoints/cookbook_artifacts_cookbook_identifier.rb

@@ -0,0 +1,67 @@
+require 'chef_zero/chef_data/data_normalizer'
+
+module ChefZero
+  module Endpoints
+    class CookbookArtifactsCookbookIdentifierEndpoint < ChefZero::Endpoints::CookbookVersionEndpoint
+      # these endpoints are almost, but not quite, not entirely unlike the corresponding /cookbooks endpoints.
+      # it could all be refactored for maximum reuse, but they're short REST methods with well-defined
+      # behavioral specs (pedant), so there's not a huge benefit.
+
+      # GET /organizations/ORG/cookbook_artifacts/NAME/IDENTIFIER
+      def get(request)
+        cookbook_data = normalize(request, parse_json(get_data(request)))
+        return json_response(200, cookbook_data)
+      end
+
+      # PUT /organizations/ORG/cookbook_artifacts/COOKBOOK/IDENTIFIER
+      def put(request)
+        if exists_data?(request)
+          return error(409, "Cookbooks cannot be modified, and a cookbook with this identifier already exists.")
+        end
+
+        set_data(request, nil, request.body, :create_dir)
+
+        return already_json_response(201, request.body)
+      end
+
+      # DELETE /organizations/ORG/cookbook_artifacts/COOKBOOK/IDENTIFIER
+      def delete(request)
+        begin
+          doomed_cookbook_json = get_data(request)
+          identified_cookbook_data = normalize(request, parse_json(doomed_cookbook_json))
+          delete_data(request)
+
+          # go through the recipes and delete stuff in the file store.
+          hoover_unused_checksums(get_checksums(doomed_cookbook_json), request, 'cookbook_artifacts')
+
+          # if this was the last revision, delete the directory so future requests will 404, instead of
+          # returning 200 with an empty list.
+          artifact_path = request.rest_path[0..-2]
+          if list_data(request, artifact_path).size == 0
+            delete_data_dir(request, artifact_path)
+          end
+
+          json_response(200, identified_cookbook_data)
+        rescue RestErrorResponse => ex
+          if ex.response_code == 404
+            error(404, "not_found")
+          else
+            raise
+          end
+        end
+      end
+
+      private
+
+      def make_file_store_path(rest_path, recipe)
+        rest_path.first(2) + ["file_store", "checksums", recipe["checksum"]]
+      end
+
+      def normalize(request, cookbook_artifact_data)
+        ChefData::DataNormalizer.normalize_cookbook(self, request.rest_path[0..1],
+                                                    cookbook_artifact_data, request.rest_path[3], request.rest_path[4],
+                                                    request.base_uri, request.method, true)
+      end
+    end
+  end
+end

data/lib/chef_zero/endpoints/cookbook_artifacts_endpoint.rb

@@ -0,0 +1,34 @@
+require 'chef_zero/chef_data/data_normalizer'
+
+module ChefZero
+  module Endpoints
+    class CookbookArtifactsEndpoint < RestBase
+      # GET /organizations/ORG/cookbook_artifacts
+      def get(request)
+        data = {}
+
+        artifacts = begin
+          list_data(request)
+        rescue Exception => e
+          if e.response_code == 404
+            return already_json_response(200, "{}")
+          end
+        end
+
+        artifacts.each do |cookbook_artifact|
+          cookbook_url = build_uri(request.base_uri, request.rest_path + [cookbook_artifact])
+
+          versions = []
+          list_data(request, request.rest_path + [cookbook_artifact]).each do |identifier|
+            artifact_url = build_uri(request.base_uri, request.rest_path + [cookbook_artifact, identifier])
+            versions << { url: artifact_url, identifier: identifier }
+          end
+
+          data[cookbook_artifact] = { url: cookbook_url, versions: versions }
+        end
+
+        return json_response(200, data)
+      end
+    end
+  end
+end

data/lib/chef_zero/endpoints/cookbook_version_endpoint.rb

@@ -85,10 +85,10 @@ module ChefZero
 
       private
 
-      def hoover_unused_checksums(deleted_checksums, request)
-        data_store.list(request.rest_path[0..1] + ['cookbooks']).each do |cookbook_name|
-          data_store.list(request.rest_path[0..1] + ['cookbooks', cookbook_name]).each do |version|
-            cookbook = data_store.get(request.rest_path[0..1] + ['cookbooks', cookbook_name, version], request)
+      def hoover_unused_checksums(deleted_checksums, request, data_type='cookbooks')
+        data_store.list(request.rest_path[0..1] + [data_type]).each do |cookbook_name|
+          data_store.list(request.rest_path[0..1] + [data_type, cookbook_name]).each do |version|
+            cookbook = data_store.get(request.rest_path[0..1] + [data_type, cookbook_name, version], request)
             deleted_checksums = deleted_checksums - get_checksums(cookbook)
           end
         end

data/lib/chef_zero/endpoints/dummy_endpoint.rb

@@ -0,0 +1,31 @@
+
+# pedant makes a couple of Solr-related calls from its search_utils.rb file that we can't work around (e.g.
+# with monkeypatching). the necessary Pedant::Config values are set in run_oc_pedant.rb. --cdoherty
+module ChefZero
+  module Endpoints
+    class DummyEndpoint < RestBase
+      # called by #direct_solr_query, once each for roles, nodes, and data bag items. each RSpec example makes
+      # 3 calls, with the expected sequence of return values [0, 1, 0].
+      def get(request)
+
+        # this could be made less brittle, but if things change to have more than 3 cycles, we should really
+        # be notified by a spec failure.
+        @mock_values ||= ([0, 1, 0] * 3).map { |val| make_response(val) }
+
+        retval = @mock_values.shift
+        json_response(200, retval)
+      end
+
+      # called by #force_solr_commit in pedant's , which doesn't check the return value.
+      def post(request)
+        # sure thing!
+        json_response(200, { message: "This dummy POST endpoint didn't do anything." })
+      end
+
+      def make_response(value)
+        { "response" => { "numFound" => value } }
+      end
+    end
+  end
+end
+

data/lib/chef_zero/endpoints/node_endpoint.rb

@@ -6,6 +6,20 @@ module ChefZero
   module Endpoints
     # /nodes/ID
     class NodeEndpoint < RestObjectEndpoint
+      def put(request)
+        data = parse_json(request.body)
+
+        if data.has_key?("policy_name") && policy_name_invalid?(data["policy_name"])
+          return error(400, "Field 'policy_name' invalid", :pretty => false)
+        end
+
+        if data.has_key?("policy_group") && policy_name_invalid?(data["policy_group"])
+          return error(400, "Field 'policy_group' invalid", :pretty => false)
+        end
+
+        super(request)
+      end
+
       def populate_defaults(request, response_json)
         node = FFI_Yajl::Parser.parse(response_json, :create_additions => false)
         node = ChefData::DataNormalizer.normalize_node(node, request.rest_path[3])

data/lib/chef_zero/endpoints/nodes_endpoint.rb

@@ -0,0 +1,35 @@
+require 'ffi_yajl'
+require 'chef_zero/endpoints/rest_object_endpoint'
+require 'chef_zero/chef_data/data_normalizer'
+
+module ChefZero
+  module Endpoints
+    # /nodes
+    class NodesEndpoint < RestListEndpoint
+
+      def post(request)
+        # /nodes validation
+        if request.rest_path.last == "nodes"
+          data = parse_json(request.body)
+
+          if data.has_key?("policy_name") && policy_name_invalid?(data["policy_name"])
+            return error(400, "Field 'policy_name' invalid", :pretty => false)
+          end
+
+          if data.has_key?("policy_group") && policy_name_invalid?(data["policy_group"])
+            return error(400, "Field 'policy_group' invalid", :pretty => false)
+          end
+        end
+
+        super(request)
+      end
+
+      def populate_defaults(request, response_json)
+        node = FFI_Yajl::Parser.parse(response_json, :create_additions => false)
+        node = ChefData::DataNormalizer.normalize_node(node, request.rest_path[3])
+        FFI_Yajl::Encoder.encode(node, :pretty => true)
+      end
+    end
+  end
+end
+

data/lib/chef_zero/endpoints/policies_endpoint.rb

@@ -1,151 +1,26 @@
-require 'ffi_yajl'
-
-require 'chef_zero/endpoints/rest_object_endpoint'
 require 'chef_zero/chef_data/data_normalizer'
 
 module ChefZero
   module Endpoints
-    # /policies/:group/:name
-    class PoliciesEndpoint < RestObjectEndpoint
-      def initialize(server)
-        super(server, 'id')
-      end
-
+    # /organizations/ORG/policies
+    class PoliciesEndpoint < RestBase
+      # GET /organizations/ORG/policies
       def get(request)
-        already_json_response(200, get_data(request))
-      end
-
-      # Right now we're allowing PUT to create.
-      def put(request)
-        error = validate(request)
-        return error if error
-
-        code =
-          if data_store.exists?(request.rest_path)
-            set_data(request, request.rest_path, request.body, :data_store_exceptions)
-            200
-          else
-            name = request.rest_path[4]
-            data_store.create(request.rest_path[0..3], name, request.body, :create_dir)
-            201
-          end
-        already_json_response(code, request.body)
-      end
-
-      def delete(request)
-        result = get_data(request, request.rest_path)
-        delete_data(request, request.rest_path, :data_store_exceptions)
-        already_json_response(200, result)
-      end
-
-      private
-
-      def validate(request)
-        req_object = validate_json(request.body)
-        validate_revision_id(request, req_object) ||
-          validate_name(request, req_object) ||
-          validate_run_list(req_object) ||
-          validate_each_run_list_item(req_object) ||
-          validate_cookbook_locks_collection(req_object) ||
-          validate_each_cookbook_locks_item(req_object)
-      end
-
-      def validate_json(request_body)
-        FFI_Yajl::Parser.parse(request_body)
-        # TODO: rescue parse error, return 400
-        # error(400, "Must specify #{identity_keys.map { |k| k.inspect }.join(' or ')} in JSON")
-      end
-
-      def validate_revision_id(request, req_object)
-        if !req_object.key?("revision_id")
-          error(400, "Field 'revision_id' missing")
-        elsif req_object["revision_id"].empty?
-          error(400, "Field 'revision_id' invalid")
-        elsif req_object["revision_id"].size > 255
-          error(400, "Field 'revision_id' invalid")
-        elsif req_object["revision_id"] !~ /^[\-[:alnum:]_\.\:]+$/
-          error(400, "Field 'revision_id' invalid")
-        end
-      end
-
-      def validate_name(request, req_object)
-        if !req_object.key?("name")
-          error(400, "Field 'name' missing")
-        elsif req_object["name"] != (uri_policy_name = URI.decode(request.rest_path[4]))
-          error(400, "Field 'name' invalid : #{uri_policy_name} does not match #{req_object["name"]}")
-        elsif req_object["name"].size > 255
-          error(400, "Field 'name' invalid")
-        elsif req_object["name"] !~ /^[\-[:alnum:]_\.\:]+$/
-          error(400, "Field 'name' invalid")
-        end
-      end
-
-      def validate_run_list(req_object)
-        if !req_object.key?("run_list")
-          error(400, "Field 'run_list' missing")
-        elsif !req_object["run_list"].kind_of?(Array)
-          error(400, "Field 'run_list' is not a valid run list")
-        end
-      end
-
-      def validate_each_run_list_item(req_object)
-        req_object["run_list"].each do |run_list_item|
-          if res_400 = validate_run_list_item(run_list_item)
-            return res_400
-          end
-        end
-        nil
-      end
+        response_data = {}
+        policy_names = list_data(request)
+        policy_names.each do |policy_name|
+          policy_path = request.rest_path + [policy_name]
+          policy_uri = build_uri(request.base_uri, policy_path)
+          revisions = list_data(request, policy_path + ["revisions"])
 
-      def validate_run_list_item(run_list_item)
-        if !run_list_item.kind_of?(String)
-          error(400, "Field 'run_list' is not a valid run list")
-        elsif run_list_item !~ /\Arecipe\[[^\s]+::[^\s]+\]\Z/
-          error(400, "Field 'run_list' is not a valid run list")
+          response_data[policy_name] = {
+            uri: policy_uri,
+            revisions: hashify_list(revisions)
+          }
         end
-      end
 
-      def validate_cookbook_locks_collection(req_object)
-        if !req_object.key?("cookbook_locks")
-          error(400, "Field 'cookbook_locks' missing")
-        elsif !req_object["cookbook_locks"].kind_of?(Hash)
-          error(400, "Field 'cookbook_locks' invalid")
-        end
+        return json_response(200, response_data)
       end
-
-      def validate_each_cookbook_locks_item(req_object)
-        req_object["cookbook_locks"].each do |cookbook_name, lock|
-          if res_400 = validate_cookbook_locks_item(cookbook_name, lock)
-            return res_400
-          end
-        end
-        nil
-      end
-
-      def validate_cookbook_locks_item(cookbook_name, lock)
-        if !lock.kind_of?(Hash)
-          error(400, "cookbook_lock entries must be a JSON object")
-        elsif !lock.key?("identifier")
-          error(400, "Field 'identifier' missing")
-        elsif lock["identifier"].size > 255
-          error(400, "Field 'identifier' invalid")
-        elsif !lock.key?("version")
-          error(400, "Field 'version' missing")
-        elsif lock.key?("dotted_decimal_identifier")
-          unless valid_version?(lock["dotted_decimal_identifier"])
-            error(400, "Field 'dotted_decimal_identifier' is not a valid version")
-          end
-        end
-      end
-
-      def valid_version?(version_string)
-        Gem::Version.new(version_string)
-        true
-      rescue ArgumentError
-        false
-      end
-
     end
   end
 end
-