chef-zero 4.4.2 → 4.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b00b9dd1a0418e42c1982b8724f0f37f636d8370
-  data.tar.gz: eae57d6dae04d8e748f2d4d11f880c50263d3cf3
+  metadata.gz: 6cc5716f0bde147efc79fb02be61275ea01aa654
+  data.tar.gz: d1a2c69275d9a2bc901f5024f47be5b821320e98
 SHA512:
-  metadata.gz: 3ceb0e894eb2bf6a7d72eed6817d6fe472f7540d8eb78d677f9b0df327ce219a4d3d996017bcf19c5129fc477bf2a18f96ef24e2248bbbbc4c6343ee910cc1af
-  data.tar.gz: be1e03b074776f923a76a81dfdc031f87de2491488e8fbc6f01a47d4e8dcf22c619b6ec2ae07b9630f9a9c88564fa9227cbdd0b526fb0f07523f92f427bd4523
+  metadata.gz: e0c7757da8314dad7ff5f58fe4423c7ee816b32138f59b16fcf9073e8b8fffc045b819781e81e119f85c553d44b6336e678c37d8aed0d729aae3f54ebbc48f3f
+  data.tar.gz: a606ffcd42a0001e1f1a43854d9f373e15f6000a29eb52129a0b5a0298eeff28675bb6d8d4e6991c179fd4b24e0a241623f9388b0d1e733f1e1a254cb9c13272

data/Gemfile

@@ -1,14 +1,16 @@
 source 'https://rubygems.org'
 gemspec
 
-gem 'rest-client', :github => 'chef/rest-client'
+# gem 'rest-client', :github => 'chef/rest-client'
 
-gem 'oc-chef-pedant', :github => 'chef/chef-server'
-
-# gem 'oc-chef-pedant', :path => "../chef-server"
+gem 'oc-chef-pedant', :github => 'chef/chef-server', :branch => "jk/authorization-tags"
 
 # 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"
+# gem 'chef', :github => 'chef/chef', :branch => 'jk/policies-acls'
+
+if ENV['GEMFILE_MOD']
+  puts "GEMFILE_MOD: #{ENV['GEMFILE_MOD']}"
+  instance_eval(ENV['GEMFILE_MOD'])
+end

data/Rakefile

@@ -45,7 +45,6 @@ end
 require 'github_changelog_generator/task'
 
 GitHubChangelogGenerator::RakeTask.new :changelog do |config|
-  config.token = ENV['GITHUB_CHANGELOG_TOKEN']
   # config.future_release = ChefZero::VERSION
   config.enhancement_labels = "enhancement,Enhancement,New Feature".split(',')
   config.bug_labels = "bug,Bug,Improvement,Upstream Bug".split(',')

data/chef-zero.gemspec

@@ -24,6 +24,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rake'
   s.add_development_dependency 'rspec'
   s.add_development_dependency 'github_changelog_generator'
+  s.add_development_dependency 'chef'
 
   s.bindir       = 'bin'
   s.executables  = ['chef-zero']

data/lib/chef_zero/chef_data/acl_path.rb

@@ -13,7 +13,8 @@ module ChefZero
     #   specified on X, they are not inherited from X's parent
     # - stop adding pivotal to acls (he already has access to what he needs)
     module AclPath
-      ORG_DATA_TYPES = %w(clients cookbooks containers data environments groups nodes roles sandboxes)
+      ORG_DATA_TYPES = %w(clients cookbook_artifacts cookbooks containers data environments groups
+                          nodes policies policy_groups roles sandboxes)
       TOP_DATA_TYPES = %w(containers organizations users)
 
       # ACL data paths for a partition are:

data/lib/chef_zero/chef_data/data_normalizer.rb

@@ -8,7 +8,7 @@ module ChefZero
       def self.normalize_acls(acls)
         ChefData::DefaultCreator::PERMISSIONS.each do |perm|
           acls[perm] ||= {}
-          acls[perm]['actors'] ||= []
+          (acls[perm]['actors'] ||= []).uniq!    # this gets doubled sometimes, for reasons.
           acls[perm]['groups'] ||= []
         end
         acls

data/lib/chef_zero/chef_data/default_creator.rb

@@ -148,6 +148,7 @@ module ChefZero
 
       DEFAULT_ORG_SPINE = {
         'clients' => {},
+        'cookbook_artifacts' => {},
         'cookbooks' => {},
         'data' => {},
         'environments' => %w(_default),
@@ -162,7 +163,7 @@ module ChefZero
         'users' => {},
 
         'org' => {},
-        'containers' => %w(clients containers cookbooks data environments groups nodes roles sandboxes policies cookbook_artifacts),
+        'containers' => %w(clients containers cookbook_artifacts cookbooks data environments groups nodes policies policy_groups roles sandboxes),
         'groups' => %w(admins billing-admins clients users),
         'association_requests' => {}
       }
@@ -281,7 +282,7 @@ module ChefZero
               'delete' => { 'groups' => %w(admins) },
               'grant'  => { 'groups' => %w(admins) },
             }
-          when 'containers/cookbooks', 'containers/environments', 'containers/roles'
+          when 'containers/environments', 'containers/roles', 'containers/policy_groups', 'containers/policies'
             {
               'create' => { 'groups' => %w(admins users) },
               'read'   => { 'groups' => %w(admins users clients) },
@@ -289,7 +290,7 @@ module ChefZero
               'delete' => { 'groups' => %w(admins users) },
               'grant'  => { 'groups' => %w(admins) },
             }
-          when 'containers/cookbooks', 'containers/data'
+          when 'containers/cookbooks', 'containers/cookbook_artifacts', 'containers/data'
             {
               'create' => { 'groups' => %w(admins users clients) },
               'read'   => { 'groups' => %w(admins users clients) },
@@ -439,7 +440,7 @@ module ChefZero
         when 4
           return path[0] == 'organizations' && (
             (path[2] == 'acls' && path[1] != 'root') ||
-            %w(cookbooks data).include?(path[2]))
+            %w(cookbooks cookbook_artifacts data policies policy_groups).include?(path[2]))
         else
           return false
         end

data/lib/chef_zero/data_store/default_facade.rb

@@ -62,7 +62,7 @@ module ChefZero
         end
 
         options_hash = options.last.is_a?(Hash) ? options.last : {}
-        default_creator.created(path + [ name ], options_hash[:requestor], options.include?(:recursive))
+        default_creator.created(path + [ name ], options_hash[:requestor], options.include?(:create_dir))
       end
 
       def get(path, request=nil)

data/lib/chef_zero/endpoints/containers_endpoint.rb

@@ -8,6 +8,18 @@ module ChefZero
       def initialize(server)
         super(server, %w(id containername))
       end
+
+      # create a container.
+      # input: {"containername"=>"new-container", "containerpath"=>"/"}
+      def post(request)
+        data = parse_json(request.body)
+        # if they don't match, id wins.
+        container_name = data["id"] || data["containername"]
+        container_path_suffix = data["containerpath"].split("/").reject { |o| o.empty? }
+        create_data(request, request.rest_path, container_name, to_json({}), :create_dir)
+
+        json_response(201, { uri: build_uri(request.base_uri, request.rest_path + container_path_suffix + [container_name]) })
+      end
     end
   end
 end

data/lib/chef_zero/endpoints/controls_endpoint.rb

@@ -0,0 +1,15 @@
+module ChefZero
+  module Endpoints
+    # /organizations/ORG/controls
+    class ControlsEndpoint < RestBase
+      # ours is not to wonder why; ours is but to make the pedant specs pass.
+      def get(request)
+        error(410, "Server says 410, chef-zero says 410.")
+      end
+
+      def post(request)
+        error(410, "Server says 410, chef-zero says 410.")
+      end
+    end
+  end
+end

data/lib/chef_zero/endpoints/policy_group_policy_endpoint.rb

@@ -56,7 +56,7 @@ module ChefZero
         # group.
         # Storage: /organizations/ORG/policies/POLICY/revisions/REVISION
         response_code = exists_data?(request) ? 200 : 201
-        set_data(request, nil, to_json(revision_id), :create_dir)
+        set_data(request, nil, to_json(revision_id), :create, :create_dir)
 
         already_json_response(response_code, request.body)
       end

data/lib/chef_zero/rest_base.rb

@@ -200,7 +200,7 @@ module ChefZero
     end
 
     def json_response(response_code, json, request_version=0, response_version=0, opts={pretty: true})
-      do_pretty_json = opts[:pretty] && true
+      do_pretty_json = !!opts[:pretty]    # make sure we have a proper Boolean.
       already_json_response(response_code, FFI_Yajl::Encoder.encode(json, :pretty => do_pretty_json), request_version, response_version)
     end
 

data/lib/chef_zero/server.rb

@@ -50,6 +50,7 @@ require 'chef_zero/endpoints/cookbook_artifact_endpoint'
 require 'chef_zero/endpoints/cookbook_artifact_identifier_endpoint'
 require 'chef_zero/endpoints/containers_endpoint'
 require 'chef_zero/endpoints/container_endpoint'
+require 'chef_zero/endpoints/controls_endpoint'
 require 'chef_zero/endpoints/dummy_endpoint'
 require 'chef_zero/endpoints/data_bags_endpoint'
 require 'chef_zero/endpoints/data_bag_endpoint'
@@ -563,6 +564,7 @@ module ChefZero
         [ "/dummy", DummyEndpoint.new(self) ],
         [ "/organizations/*/clients", ActorsEndpoint.new(self) ],
         [ "/organizations/*/clients/*", ActorEndpoint.new(self) ],
+        [ "/organizations/*/controls", ControlsEndpoint.new(self) ],
         [ "/organizations/*/cookbooks", CookbooksEndpoint.new(self) ],
         [ "/organizations/*/cookbooks/*", CookbookEndpoint.new(self) ],
         [ "/organizations/*/cookbooks/*/*", CookbookVersionEndpoint.new(self) ],

data/lib/chef_zero/version.rb

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

data/spec/run_oc_pedant.rb

@@ -84,21 +84,27 @@ begin
       '--skip-organizations',
       '--skip-multiuser',
 
-      # will be supported.
-      '--skip-policies',
-      '--skip-cookbook-artifacts',
+      # 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
+      # reserved only for quirks that are *irrevocable* and by design; and
+      # should barely be used at all.
+      '--skip-chef-zero-quirks',
     ]
   else
     []
   end
-
-  # "the goal is that only authorization, authentication and validation tests are turned off" - @jkeiser
-  Pedant.setup([
-    '--skip-knife',
+  # The latest released Chef doesn't do ACLs, Cookbook Artifacts or Policies yet
+  chef_fs_skips << '--skip-acl'
+  chef_fs_skips << '--skip-cookbook-artifacts'
+  chef_fs_skips << '--skip-policies'
+
+  # 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',
-    '--skip-controls',
-    '--skip-acl',
-    '--skip-headers',
 
     # Chef Zero does not intend to support validation the way erchef does.
     '--skip-validation',
@@ -122,15 +128,25 @@ begin
     '--skip-usags',
 
     # Chef 12 features not yet 100% supported by Chef Zero
-    '--skip-containers',
     '--skip-api-v1',
 
     # The universe endpoint is unlikely to ever make sense for Chef Zero
-    '--skip-universe'
-  ] + chef_fs_skips)
+    '--skip-universe',
+  ]
+
+  # The knife tests are very slow and don't give us a lot of extra coverage,
+  # so we run them in a different entry in the travis test matrix.
+  pedant_args =
+    if ENV["PEDANT_KNIFE_TESTS"]
+      default_skips + %w{ --focus-knife }
+    else
+      default_skips + chef_fs_skips + %w{ --skip-knife }
+    end
+
+  Pedant.setup(pedant_args)
 
-  fail_fast = []
-  # fail_fast = ["--fail-fast"]
+  fail_fast = %w()#--fail-fast)
+  #fail_fast = ["--fail-fast"]
 
   result = RSpec::Core::Runner.run(Pedant.config.rspec_args + fail_fast)
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef-zero
 version: !ruby/object:Gem::Version
-  version: 4.4.2
+  version: 4.5.0
 platform: ruby
 authors:
 - John Keiser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-15 00:00:00.000000000 Z
+date: 2016-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-log
@@ -170,6 +170,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: chef
+  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'
 description: Self-contained, easy-setup, fast-start in-memory Chef server for testing
   and solo setup purposes
 email: jkeiser@opscode.com
@@ -207,6 +221,7 @@ files:
 - lib/chef_zero/endpoints/authenticate_user_endpoint.rb
 - lib/chef_zero/endpoints/container_endpoint.rb
 - lib/chef_zero/endpoints/containers_endpoint.rb
+- lib/chef_zero/endpoints/controls_endpoint.rb
 - lib/chef_zero/endpoints/cookbook_artifact_endpoint.rb
 - lib/chef_zero/endpoints/cookbook_artifact_identifier_endpoint.rb
 - lib/chef_zero/endpoints/cookbook_artifacts_endpoint.rb
@@ -309,7 +324,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.0
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Self-contained, easy-setup, fast-start in-memory Chef server for testing