chef-zero 4.5.0 → 4.6.0

data/lib/chef_zero/rest_error_response.rb

@@ -1,11 +1,11 @@
 module ChefZero
   class RestErrorResponse < StandardError
+    attr_reader :response_code, :error
+
     def initialize(response_code, error)
       @response_code = response_code
       @error = error
+      super "#{response_code}: #{error}"
     end
-
-    attr_reader :response_code
-    attr_reader :error
   end
 end

data/lib/chef_zero/rest_request.rb

@@ -2,6 +2,9 @@ require 'rack/request'
 
 module ChefZero
   class RestRequest
+
+    ZERO = "0".freeze
+
     def initialize(env, rest_base_prefix = [])
       @env = env
       @rest_base_prefix = rest_base_prefix
@@ -19,7 +22,11 @@ module ChefZero
     end
 
     def api_version
-      @env['HTTP_X_OPS_SERVER_API_VERSION'] || 0
+      @env['HTTP_X_OPS_SERVER_API_VERSION'] || ZERO
+    end
+
+    def api_v0?
+      api_version == ZERO
     end
 
     def requestor
@@ -34,6 +41,10 @@ module ChefZero
       @rest_path ||= rest_base_prefix + env['PATH_INFO'].split('/').select { |part| part != "" }
     end
 
+    def rest_path=(rest_path)
+      @rest_path = rest_path
+    end
+
     def body=(body)
       @body = body
     end

data/lib/chef_zero/rest_router.rb

@@ -1,3 +1,5 @@
+require 'pp'
+
 module ChefZero
   class RestRouter
     def initialize(routes)
@@ -15,24 +17,18 @@ module ChefZero
     attr_accessor :not_found
 
     def call(request)
-      begin
-        ChefZero::Log.debug(request)
-        ChefZero::Log.debug(request.body) if request.body
-
-        clean_path = "/" + request.rest_path.join("/")
-
-        response = find_endpoint(clean_path).call(request)
-        ChefZero::Log.debug([
-          "",
-          "--- RESPONSE (#{response[0]}) ---",
-          response[2],
-          "--- END RESPONSE ---",
-        ].join("\n"))
-        return response
-      rescue
-        ChefZero::Log.error("#{$!.inspect}\n#{$!.backtrace.join("\n")}")
-        [500, {"Content-Type" => "text/plain"}, "Exception raised!  #{$!.inspect}\n#{$!.backtrace.join("\n")}"]
+      log_request(request)
+
+      clean_path = "/" + request.rest_path.join("/")
+
+      find_endpoint(clean_path).call(request).tap do |response|
+        log_response(response)
       end
+    rescue => ex
+      exception = "#{ex.inspect}\n#{ex.backtrace.join("\n")}"
+
+      ChefZero::Log.error(exception)
+      [ 500, { "Content-Type" => "text/plain" }, "Exception raised! #{exception}" ]
     end
 
     private
@@ -41,5 +37,36 @@ module ChefZero
         _, endpoint = routes.find { |route, endpoint| route.match(clean_path) }
         endpoint || not_found
       end
+
+      def log_request(request)
+        ChefZero::Log.info do
+          "#{request.method} /#{request.rest_path.join("/")}".tap do |msg|
+            next unless request.method =~ /^(POST|PUT)$/
+
+            if request.body.nil? || request.body.empty?
+              msg << " (no body)"
+            else
+              msg << [
+                "",
+                "--- #{request.method} BODY ---",
+                request.body.chomp,
+                "--- END #{request.method} BODY ---"
+              ].join("\n")
+            end
+          end
+        end
+
+        ChefZero::Log.debug { request.pretty_inspect }
+      end
+
+      def log_response(response)
+        ChefZero::Log.info {
+          [ "",
+            "--- RESPONSE (#{response[0]}) ---",
+            response[2].chomp,
+            "--- END RESPONSE ---",
+          ].join("\n")
+        }
+      end
   end
 end

data/lib/chef_zero/rspec.rb

@@ -67,7 +67,7 @@ module ChefZero
           if chef_server_options[:server_scope] != self.class.chef_server_options[:server_scope]
             raise "server_scope: #{chef_server_options[:server_scope]} will not be honored: it can only be set on when_the_chef_server!"
           end
-          Log.debug("Starting Chef server with options #{chef_server_options}")
+          Log.info("Starting Chef server with options #{chef_server_options}")
 
           ChefZero::RSpec.set_server_options(chef_server_options)
 

data/lib/chef_zero/server.rb

@@ -40,8 +40,14 @@ require 'chef_zero/endpoints/rest_list_endpoint'
 require 'chef_zero/endpoints/authenticate_user_endpoint'
 require 'chef_zero/endpoints/acls_endpoint'
 require 'chef_zero/endpoints/acl_endpoint'
-require 'chef_zero/endpoints/actors_endpoint'
 require 'chef_zero/endpoints/actor_endpoint'
+require 'chef_zero/endpoints/actors_endpoint'
+require 'chef_zero/endpoints/actor_key_endpoint'
+require 'chef_zero/endpoints/organization_user_key_endpoint'
+require 'chef_zero/endpoints/organization_user_default_key_endpoint'
+require 'chef_zero/endpoints/organization_user_keys_endpoint'
+require 'chef_zero/endpoints/actor_default_key_endpoint'
+require 'chef_zero/endpoints/actor_keys_endpoint'
 require 'chef_zero/endpoints/cookbooks_endpoint'
 require 'chef_zero/endpoints/cookbook_endpoint'
 require 'chef_zero/endpoints/cookbook_version_endpoint'
@@ -105,9 +111,9 @@ module ChefZero
   class Server
 
     DEFAULT_OPTIONS = {
-      :host => '127.0.0.1',
+      :host => ['127.0.0.1'],
       :port => 8889,
-      :log_level => :info,
+      :log_level => :warn,
       :generate_real_keys => true,
       :single_org => 'chef',
       :ssl => false
@@ -136,6 +142,7 @@ module ChefZero
     def port
       if @port
         @port
+      # If options[:port] is not an Array or an Enumerable, it is just an Integer.
       elsif !options[:port].respond_to?(:each)
         options[:port]
       else
@@ -158,10 +165,11 @@ module ChefZero
     #
     def url
       sch = @options[:ssl] ? 'https' : 'http'
-      @url ||= if @options[:host].include?(':')
-                 URI("#{sch}://[#{@options[:host]}]:#{port}").to_s
+      hosts = Array(@options[:host])
+      @url ||= if hosts.first.include?(':')
+                 URI("#{sch}://[#{hosts.first}]:#{port}").to_s
                else
-                 URI("#{sch}://#{@options[:host]}:#{port}").to_s
+                 URI("#{sch}://#{hosts.first}:#{port}").to_s
                end
     end
 
@@ -259,6 +267,18 @@ module ChefZero
     # @return [Thread]
     #   the thread the background process is running in
     #
+    def listen(hosts, port)
+      hosts.each do |host|
+        @server.listen(host, port)
+      end
+      true
+    rescue Errno::EADDRINUSE
+      ChefZero::Log.warn("Port #{port} not available")
+      @server.listeners.each { |l| l.close }
+      @server.listeners.clear
+      false
+    end
+
     def start_background(wait = 5)
       @server = WEBrick::HTTPServer.new(
         :DoNotListen => true,
@@ -274,22 +294,17 @@ module ChefZero
       @server.mount('/', Rack::Handler::WEBrick, app)
 
       # Pick a port
-      if options[:port].respond_to?(:each)
-        options[:port].each do |port|
-          begin
-            @server.listen(options[:host], port)
-            @port = port
-            break
-          rescue Errno::EADDRINUSE
-            ChefZero::Log.info("Port #{port} in use: #{$!}")
-          end
-        end
-        if !@port
-          raise Errno::EADDRINUSE, "No port in :port range #{options[:port]} is available"
+      # If options[:port] can be an Enumerator, an Array, or an Integer,
+      # we need something that can respond to .each (Enum and Array can already).
+      Array(options[:port]).each do |port|
+        if listen(Array(options[:host]), port)
+          @port = port
+          break
         end
-      else
-        @server.listen(options[:host], options[:port])
-        @port = options[:port]
+      end
+      if !@port
+        raise Errno::EADDRINUSE,
+          "No port in :port range #{options[:port]} is available"
       end
 
       # Start the server in the background
@@ -523,7 +538,7 @@ module ChefZero
         [
           [ "/organizations/*/users", ActorsEndpoint.new(self) ],
           [ "/organizations/*/users/*", ActorEndpoint.new(self) ],
-          [ "/organizations/*/authenticate_user", OrganizationAuthenticateUserEndpoint.new(self) ],
+          [ "/organizations/*/authenticate_user", OrganizationAuthenticateUserEndpoint.new(self) ]
         ]
       else
         # EC-only
@@ -537,11 +552,13 @@ module ChefZero
           [ "/users/*/association_requests", UserAssociationRequestsEndpoint.new(self) ],
           [ "/users/*/association_requests/count", UserAssociationRequestsCountEndpoint.new(self) ],
           [ "/users/*/association_requests/*", UserAssociationRequestEndpoint.new(self) ],
+          [ "/users/*/keys", ActorKeysEndpoint.new(self) ],
+          [ "/users/*/keys/default", ActorDefaultKeyEndpoint.new(self) ],
+          [ "/users/*/keys/*", ActorKeyEndpoint.new(self) ],
           [ "/users/*/organizations", UserOrganizationsEndpoint.new(self) ],
           [ "/authenticate_user", AuthenticateUserEndpoint.new(self) ],
           [ "/system_recovery", SystemRecoveryEndpoint.new(self) ],
           [ "/license", LicenseEndpoint.new(self) ],
-
           [ "/organizations", OrganizationsEndpoint.new(self) ],
           [ "/organizations/*", OrganizationEndpoint.new(self) ],
           [ "/organizations/*/_validator_key", OrganizationValidatorKeyEndpoint.new(self) ],
@@ -564,6 +581,12 @@ module ChefZero
         [ "/dummy", DummyEndpoint.new(self) ],
         [ "/organizations/*/clients", ActorsEndpoint.new(self) ],
         [ "/organizations/*/clients/*", ActorEndpoint.new(self) ],
+        [ "/organizations/*/clients/*/keys", ActorKeysEndpoint.new(self) ],
+        [ "/organizations/*/clients/*/keys/default", ActorDefaultKeyEndpoint.new(self) ],
+        [ "/organizations/*/clients/*/keys/*", ActorKeyEndpoint.new(self) ],
+        [ "/organizations/*/users/*/keys", OrganizationUserKeysEndpoint.new(self) ],
+        [ "/organizations/*/users/*/keys/default", OrganizationUserDefaultKeyEndpoint.new(self) ],
+        [ "/organizations/*/users/*/keys/*", OrganizationUserKeyEndpoint.new(self) ],
         [ "/organizations/*/controls", ControlsEndpoint.new(self) ],
         [ "/organizations/*/cookbooks", CookbooksEndpoint.new(self) ],
         [ "/organizations/*/cookbooks/*", CookbookEndpoint.new(self) ],

data/lib/chef_zero/version.rb

@@ -1,3 +1,3 @@
 module ChefZero
-  VERSION = '4.5.0'
+  VERSION = '4.6.0'
 end

data/spec/run_oc_pedant.rb

@@ -5,6 +5,42 @@ require 'bundler/setup'
 require 'chef_zero/server'
 require 'rspec/core'
 
+# This file runs oc-chef-pedant specs and is invoked by `rake pedant`
+# and other Rake tasks. Run `rake -T` to list tasks.
+#
+# Options for oc-chef-pedant and rspec can be specified via
+# ENV['PEDANT_OPTS'] and ENV['RSPEC_OPTS'], respectively.
+#
+# The log level can be specified via ENV['LOG_LEVEL'].
+#
+# Example:
+#
+#     $ PEDANT_OPTS="--focus-users --skip-keys" \
+#     >   RSPEC_OPTS="--fail-fast --profile 5" \
+#     >   LOG_LEVEL=debug \
+#     >   rake pedant
+#
+
+DEFAULT_SERVER_OPTIONS = {
+  port: 8889,
+  single_org: false,
+}.freeze
+
+DEFAULT_LOG_LEVEL = :warn
+
+def log_level
+  return ENV['LOG_LEVEL'].downcase.to_sym if ENV['LOG_LEVEL']
+  return :debug if ENV['DEBUG']
+  DEFAULT_LOG_LEVEL
+end
+
+def start_chef_server(opts={})
+  opts = DEFAULT_SERVER_OPTIONS.merge(opts)
+  opts[:log_level] = log_level
+
+  ChefZero::Server.new(opts).tap {|server| server.start_background }
+end
+
 def start_cheffs_server(chef_repo_path)
   require 'chef/version'
   require 'chef/config'
@@ -34,37 +70,42 @@ def start_cheffs_server(chef_repo_path)
   data_store.set(%w(organizations pedant-testorg groups admins), '{ "users": [ "pivotal" ] }')
   data_store.set(%w(organizations pedant-testorg groups users), '{ "users": [ "pivotal" ] }')
 
-  server = ChefZero::Server.new(
-    port: 8889,
-    data_store: data_store,
-    single_org: false,
-    #log_level: :debug
-  )
-  server.start_background
-  server
+  start_chef_server(data_store: data_store)
 end
 
-tmpdir = nil
+def pedant_args_from_env
+  args_from_env('PEDANT_OPTS')
+end
+
+def rspec_args_from_env
+  args_from_env('RSPEC_OPTS')
+end
+
+def args_from_env(key)
+  return [] unless ENV[key]
+  ENV[key].split
+end
 
 begin
-  if ENV['FILE_STORE']
-    require 'tmpdir'
-    require 'chef_zero/data_store/raw_file_store'
-    tmpdir = Dir.mktmpdir
-    data_store = ChefZero::DataStore::RawFileStore.new(tmpdir, true)
-    data_store = ChefZero::DataStore::DefaultFacade.new(data_store, false, false)
-    server = ChefZero::Server.new(:port => 8889, :single_org => false, :data_store => data_store)
-    server.start_background
-
-  elsif ENV['CHEF_FS']
-    require 'tmpdir'
-    tmpdir = Dir.mktmpdir
-    server = start_cheffs_server(tmpdir)
+  tmpdir = nil
+  server =
+    if ENV['FILE_STORE']
+      require 'tmpdir'
+      require 'chef_zero/data_store/raw_file_store'
+      tmpdir = Dir.mktmpdir
+      data_store = ChefZero::DataStore::RawFileStore.new(tmpdir, true)
+      data_store = ChefZero::DataStore::DefaultFacade.new(data_store, false, false)
+
+      start_chef_server(data_store: data_store)
+
+    elsif ENV['CHEF_FS']
+      require 'tmpdir'
+      tmpdir = Dir.mktmpdir
+      start_cheffs_server(tmpdir)
 
-  else
-    server = ChefZero::Server.new(:port => 8889, :single_org => false)#, :log_level => :debug)
-    server.start_background
-  end
+    else
+      start_chef_server
+    end
 
   require 'rspec/core'
   require 'pedant'
@@ -83,6 +124,7 @@ begin
       '--skip-users',
       '--skip-organizations',
       '--skip-multiuser',
+      '--skip-user-keys',
 
       # chef-zero has some non-removable quirks, such as the fact that files
       # with 255-character names cannot be stored in local mode. This is
@@ -98,13 +140,17 @@ begin
   chef_fs_skips << '--skip-cookbook-artifacts'
   chef_fs_skips << '--skip-policies'
 
+  # Multi-keys don't work prior to 12.8
+  unless Gem::Requirement.new(">= 12.8.0").satisfied_by?(Gem::Version.new(Chef::VERSION))
+    chef_fs_skips << '--skip-keys'
+  end
+
   # These things aren't supported by Chef Zero in any mode of operation:
   default_skips = [
     # "the goal is that only authorization, authentication and validation tests
     # are turned off" - @jkeiser
     #
     # ...but we're not there yet
-    '--skip-keys',
 
     # Chef Zero does not intend to support validation the way erchef does.
     '--skip-validation',
@@ -128,7 +174,6 @@ begin
     '--skip-usags',
 
     # Chef 12 features not yet 100% supported by Chef Zero
-    '--skip-api-v1',
 
     # The universe endpoint is unlikely to ever make sense for Chef Zero
     '--skip-universe',
@@ -143,12 +188,10 @@ begin
       default_skips + chef_fs_skips + %w{ --skip-knife }
     end
 
-  Pedant.setup(pedant_args)
-
-  fail_fast = %w()#--fail-fast)
-  #fail_fast = ["--fail-fast"]
+  Pedant.setup(pedant_args + pedant_args_from_env)
 
-  result = RSpec::Core::Runner.run(Pedant.config.rspec_args + fail_fast)
+  rspec_args = Pedant.config.rspec_args + rspec_args_from_env
+  result = RSpec::Core::Runner.run(rspec_args)
 
   server.stop if server.running?
 ensure

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef-zero
 version: !ruby/object:Gem::Version
-  version: 4.5.0
+  version: 4.6.0
 platform: ruby
 authors:
 - John Keiser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-29 00:00:00.000000000 Z
+date: 2016-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-log
@@ -156,20 +156,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: github_changelog_generator
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: chef
   requirement: !ruby/object:Gem::Requirement
@@ -216,7 +202,10 @@ files:
 - lib/chef_zero/data_store/v2_to_v1_adapter.rb
 - lib/chef_zero/endpoints/acl_endpoint.rb
 - lib/chef_zero/endpoints/acls_endpoint.rb
+- lib/chef_zero/endpoints/actor_default_key_endpoint.rb
 - lib/chef_zero/endpoints/actor_endpoint.rb
+- lib/chef_zero/endpoints/actor_key_endpoint.rb
+- lib/chef_zero/endpoints/actor_keys_endpoint.rb
 - lib/chef_zero/endpoints/actors_endpoint.rb
 - lib/chef_zero/endpoints/authenticate_user_endpoint.rb
 - lib/chef_zero/endpoints/container_endpoint.rb
@@ -253,7 +242,10 @@ files:
 - lib/chef_zero/endpoints/organization_authenticate_user_endpoint.rb
 - lib/chef_zero/endpoints/organization_endpoint.rb
 - lib/chef_zero/endpoints/organization_user_base.rb
+- lib/chef_zero/endpoints/organization_user_default_key_endpoint.rb
 - lib/chef_zero/endpoints/organization_user_endpoint.rb
+- lib/chef_zero/endpoints/organization_user_key_endpoint.rb
+- lib/chef_zero/endpoints/organization_user_keys_endpoint.rb
 - lib/chef_zero/endpoints/organization_users_endpoint.rb
 - lib/chef_zero/endpoints/organization_validator_key_endpoint.rb
 - lib/chef_zero/endpoints/organizations_endpoint.rb
@@ -316,7 +308,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="