chef-zero 4.3.2 → 4.4.0

data/lib/chef_zero/version.rb

@@ -1,3 +1,3 @@
 module ChefZero
-  VERSION = '4.3.2'
+  VERSION = '4.4.0'
 end

data/spec/run_oc_pedant.rb

@@ -5,6 +5,45 @@ require 'bundler/setup'
 require 'chef_zero/server'
 require 'rspec/core'
 
+def start_cheffs_server(chef_repo_path)
+  require 'chef/version'
+  require 'chef/config'
+  require 'chef/chef_fs/config'
+  require 'chef/chef_fs/chef_fs_data_store'
+  require 'chef_zero/server'
+
+  Dir.mkdir(chef_repo_path) if !File.exists?(chef_repo_path)
+
+  # 11.6 and below had a bug where it couldn't create the repo children automatically
+  if Chef::VERSION.to_f < 11.8
+    %w(clients cookbooks data_bags environments nodes roles users).each do |child|
+      Dir.mkdir("#{chef_repo_path}/#{child}") if !File.exists?("#{chef_repo_path}/#{child}")
+    end
+  end
+
+  # Start the new server
+  Chef::Config.repo_mode = 'hosted_everything'
+  Chef::Config.chef_repo_path = chef_repo_path
+  Chef::Config.versioned_cookbooks = true
+  chef_fs_config = Chef::ChefFS::Config.new
+
+  data_store = Chef::ChefFS::ChefFSDataStore.new(chef_fs_config.local_fs, chef_fs_config.chef_config)
+  data_store = ChefZero::DataStore::V1ToV2Adapter.new(data_store, 'pedant-testorg')
+  data_store = ChefZero::DataStore::DefaultFacade.new(data_store, 'pedant-testorg', false)
+  data_store.create(%w(organizations pedant-testorg users), 'pivotal', '{}')
+  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
+end
+
 tmpdir = nil
 
 begin
@@ -17,6 +56,11 @@ begin
     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)
+
   else
     server = ChefZero::Server.new(:port => 8889, :single_org => false)#, :log_level => :debug)
     server.start_background
@@ -26,12 +70,29 @@ begin
   require 'pedant'
   require 'pedant/organization'
 
-  #Pedant::Config.rerun = true
+  # Pedant::Config.rerun = true
 
   Pedant.config.suite = 'api'
-  Pedant.config.internal_server = 'http://localhost:8889'
+
   Pedant.config[:config_file] = 'spec/support/oc_pedant.rb'
-  Pedant.config[:server_api_version] = 0
+
+  # Because ChefFS can only ever have one user (pivotal), we can't do most of the
+  # tests that involve multiple
+  chef_fs_skips = if ENV['CHEF_FS']
+    [ '--skip-association',
+      '--skip-users',
+      '--skip-organizations',
+      '--skip-multiuser',
+
+      # will be supported.
+      '--skip-policies',
+      '--skip-cookbook-artifacts',
+    ]
+  else
+    []
+  end
+
+  # "the goal is that only authorization, authentication and validation tests are turned off" - @jkeiser
   Pedant.setup([
     '--skip-knife',
     '--skip-keys',
@@ -46,14 +107,14 @@ begin
     '--skip-headers',
 
     # Chef 12 features not yet 100% supported by Chef Zero
-    '--skip-policies',
-    '--skip-cookbook-artifacts',
     '--skip-containers',
     '--skip-api-v1'
+  ] + chef_fs_skips)
 
-  ])
+  fail_fast = []
+  # fail_fast = ["--fail-fast"]
 
-  result = RSpec::Core::Runner.run(Pedant.config.rspec_args)
+  result = RSpec::Core::Runner.run(Pedant.config.rspec_args + fail_fast)
 
   server.stop if server.running?
 ensure

data/spec/support/oc_pedant.rb

@@ -45,6 +45,16 @@ maximum_search_time 0
 # # to be enabled for Pedant tests to work correctly
 explicit_port_url true
 
+server_api_version 0
+
+internal_server chef_server
+
+# see dummy_endpoint.rb for details.
+search_server   chef_server
+search_commit_url "/dummy"
+search_url_fmt    "/dummy?fq=+X_CHEF_type_CHEF_X:%{type}&q=%{query}&wt=json"
+
+
 # We're starting to break tests up into groups based on different
 # criteria.  The proper API tests (the results of which are viewable
 # to OPC customers) should be the only ones run by Pedant embedded in
@@ -59,9 +69,12 @@ explicit_port_url true
 # value.
 include_internal false
 
-# This is the bit that is different from pedant.rb
-org({:name => "pedant-testorg",
-     :create_me => true})
+key = 'spec/support/stickywicket.pem'
+
+org(name: "pedant-testorg",
+    create_me: !ENV['CHEF_FS'],
+    validator_key: key)
+
 internal_account_url chef_server
 delete_org true
 
@@ -72,11 +85,16 @@ delete_org true
 # are using pre-existing users, you must supply a ':key_file' key,
 # which should be the fully-qualified path /on the machine Pedant is
 # running on/ to a private key for that user.
-key = 'spec/support/stickywicket.pem'
 superuser_name 'pivotal'
 superuser_key key
 webui_key key
 
+def cheffs_or_else_user(value)
+  ENV['CHEF_FS'] ? "pivotal" : value
+end
+
+keyfile_maybe = ENV['CHEF_FS'] ? { key_file: key } : { key_file: nil }
+
 requestors({
              :clients => {
                # The the admin user, for the purposes of getting things rolling
@@ -102,24 +120,26 @@ requestors({
              :users => {
                # An administrator in the testing organization
                :admin => {
-                 :name => "pedant_admin_user",
-                 :create_me => true,
+                 :name => cheffs_or_else_user("pedant_admin_user"),
+                 :create_me => !ENV['CHEF_FS'],
+                 :associate => !ENV['CHEF_FS'],
                  :create_knife => true
-               },
+               }.merge(keyfile_maybe),
 
                :non_admin => {
-                 :name => "pedant_user",
-                 :create_me => true,
+                 :name => cheffs_or_else_user("pedant_user"),
+                 :create_me => !ENV['CHEF_FS'],
+                 :associate => !ENV['CHEF_FS'],
                  :create_knife => true
-               },
+               }.merge(keyfile_maybe),
 
                # A user that is not a member of the testing organization
                :bad => {
-                 :name => "pedant-nobody",
-                 :create_me => true,
+                 :name => cheffs_or_else_user("pedant-nobody"),
+                 :create_me => !ENV['CHEF_FS'],
                  :create_knife => true,
                  :associate => false
-               },
+               }.merge(keyfile_maybe),
              }
            })
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef-zero
 version: !ruby/object:Gem::Version
-  version: 4.3.2
+  version: 4.4.0
 platform: ruby
 authors:
 - John Keiser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-30 00:00:00.000000000 Z
+date: 2015-12-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-log
@@ -86,6 +86,48 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  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: pry-byebug
+  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: pry-stack_explorer
+  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: rake
   requirement: !ruby/object:Gem::Requirement
@@ -136,10 +178,12 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- Gemfile
 - LICENSE
 - README.md
 - Rakefile
 - bin/chef-zero
+- chef-zero.gemspec
 - lib/chef_zero.rb
 - lib/chef_zero/chef_data/acl_path.rb
 - lib/chef_zero/chef_data/cookbook_data.rb
@@ -163,6 +207,9 @@ 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/cookbook_artifacts_cookbook_endpoint.rb
+- lib/chef_zero/endpoints/cookbook_artifacts_cookbook_identifier.rb
+- lib/chef_zero/endpoints/cookbook_artifacts_endpoint.rb
 - lib/chef_zero/endpoints/cookbook_endpoint.rb
 - lib/chef_zero/endpoints/cookbook_version_endpoint.rb
 - lib/chef_zero/endpoints/cookbooks_base.rb
@@ -170,6 +217,7 @@ files:
 - lib/chef_zero/endpoints/data_bag_endpoint.rb
 - lib/chef_zero/endpoints/data_bag_item_endpoint.rb
 - lib/chef_zero/endpoints/data_bags_endpoint.rb
+- lib/chef_zero/endpoints/dummy_endpoint.rb
 - lib/chef_zero/endpoints/environment_cookbook_endpoint.rb
 - lib/chef_zero/endpoints/environment_cookbook_versions_endpoint.rb
 - lib/chef_zero/endpoints/environment_cookbooks_endpoint.rb
@@ -183,6 +231,7 @@ files:
 - lib/chef_zero/endpoints/license_endpoint.rb
 - lib/chef_zero/endpoints/node_endpoint.rb
 - lib/chef_zero/endpoints/node_identifiers_endpoint.rb
+- lib/chef_zero/endpoints/nodes_endpoint.rb
 - lib/chef_zero/endpoints/not_found_endpoint.rb
 - lib/chef_zero/endpoints/organization_association_request_endpoint.rb
 - lib/chef_zero/endpoints/organization_association_requests_endpoint.rb
@@ -194,6 +243,12 @@ files:
 - lib/chef_zero/endpoints/organization_validator_key_endpoint.rb
 - lib/chef_zero/endpoints/organizations_endpoint.rb
 - lib/chef_zero/endpoints/policies_endpoint.rb
+- lib/chef_zero/endpoints/policy_endpoint.rb
+- lib/chef_zero/endpoints/policy_group_endpoint.rb
+- lib/chef_zero/endpoints/policy_group_policy_endpoint.rb
+- lib/chef_zero/endpoints/policy_groups_endpoint.rb
+- lib/chef_zero/endpoints/policy_revision_endpoint.rb
+- lib/chef_zero/endpoints/policy_revisions_endpoint.rb
 - lib/chef_zero/endpoints/principal_endpoint.rb
 - lib/chef_zero/endpoints/rest_list_endpoint.rb
 - lib/chef_zero/endpoints/rest_object_endpoint.rb
@@ -254,10 +309,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.2.3
 signing_key: 
 specification_version: 4
 summary: Self-contained, easy-setup, fast-start in-memory Chef server for testing
   and solo setup purposes
 test_files: []
-has_rdoc: