chef-zero 15.0.17 → 15.0.21

data/spec/run_oc_pedant.rb

@@ -1,226 +1,226 @@
-#!/usr/bin/env ruby
-require "json" unless defined?(JSON)
-require "bundler"
-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(&:start_background)
-end
-
-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) unless File.exist?(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}") unless File.exist?("#{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" ] }')
-
-  start_chef_server(data_store: data_store)
-end
-
-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
-  tmpdir = nil
-  server =
-    if ENV["FILE_STORE"]
-      require "tmpdir" unless defined?(Dir.mktmpdir)
-      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" unless defined?(Dir.mktmpdir)
-      tmpdir = Dir.mktmpdir
-      start_cheffs_server(tmpdir)
-
-    else
-      start_chef_server
-    end
-
-  test_secrets = JSON.parse(File.read("spec/support/secrets.json"))
-  ENV["SUPERUSER_KEY"] = test_secrets["chef-server"]["superuser_key"]
-  ENV["WEBUI_KEY"] = test_secrets["chef-server"]["webui_key"]
-
-  require "rspec/core"
-  require "pedant"
-  require "pedant/organization"
-
-  # Pedant::Config.rerun = true
-
-  Pedant.config.suite = "api"
-
-  Pedant.config[:config_file] = "spec/support/oc_pedant.rb"
-
-  # 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",
-                      "--skip-user-keys",
-                    ]
-                  else
-                    []
-                  end
-
-  unless Gem::Requirement.new(">= 12.8.0").satisfied_by?(Gem::Version.new(Chef::VERSION))
-    chef_fs_skips << "--skip-keys"
-  end
-
-  unless Gem::Requirement.new(">= 12.13.19").satisfied_by?(Gem::Version.new(Chef::VERSION))
-    chef_fs_skips << "--skip-acl"
-    chef_fs_skips << "--skip-cookbook-artifacts"
-    chef_fs_skips << "--skip-policies"
-  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
-
-    # Chef Zero does not intend to support validation the way erchef does.
-    "--skip-validation",
-
-    # Chef Zero does not intend to support authentication the way erchef does.
-    "--skip-authentication",
-
-    # Chef Zero does not intend to support authorization the way erchef does.
-    "--skip-authorization",
-
-    # Chef Zero does not intend to support oc_id authentication/authorization
-    # the way erchef does.
-    "--skip-oc_id",
-
-    # Omnibus tests depend on erchef features that are specific to erchef and
-    # bundled in the omnibus package. Currently the only test in this category
-    # is for the search reindexing script.
-    "--skip-omnibus",
-
-    # USAGs (user-specific association groups) are Authz groups that contain
-    # only one user and represent that user's association with an org. Though
-    # there are good reasons for them, they don't work well in practice and
-    # only the manage console really uses them. Since Chef Zero + Manage is a
-    # quite unusual configuration, we're ignoring them.
-    "--skip-usags",
-
-    # Chef 12 features not yet 100% supported by Chef Zero
-
-    # 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. This is also used to skip the user acl
-    # tests from chef-server as the user acls are not supported in chef-zero
-    # at this time.
-    "--skip-chef-zero-quirks",
-
-    "--skip-status",
-    "--skip=email_case_insensitive",
-    "--skip=nginx_default_error",
-    "--skip=response_headers"
-  ]
-
-  # 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 + pedant_args_from_env)
-
-  rspec_args = Pedant.config.rspec_args + rspec_args_from_env
-
-  if defined? Chef::ChefFS::FileSystemCache
-    RSpec.configure do |c|
-      c.before(:each) do
-        Chef::ChefFS::FileSystemCache.instance.reset!
-      end
-    end
-  end
-
-  result = RSpec::Core::Runner.run(rspec_args)
-
-  server.stop if server.running?
-ensure
-  FileUtils.remove_entry_secure(tmpdir) if tmpdir
-end
-
-exit(result)
+#!/usr/bin/env ruby
+require "json" unless defined?(JSON)
+require "bundler"
+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(&:start_background)
+end
+
+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) unless File.exist?(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}") unless File.exist?("#{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" ] }')
+
+  start_chef_server(data_store: data_store)
+end
+
+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
+  tmpdir = nil
+  server =
+    if ENV["FILE_STORE"]
+      require "tmpdir" unless defined?(Dir.mktmpdir)
+      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" unless defined?(Dir.mktmpdir)
+      tmpdir = Dir.mktmpdir
+      start_cheffs_server(tmpdir)
+
+    else
+      start_chef_server
+    end
+
+  test_secrets = JSON.parse(File.read("spec/support/secrets.json"))
+  ENV["SUPERUSER_KEY"] = test_secrets["chef-server"]["superuser_key"]
+  ENV["WEBUI_KEY"] = test_secrets["chef-server"]["webui_key"]
+
+  require "rspec/core"
+  require "pedant"
+  require "pedant/organization"
+
+  # Pedant::Config.rerun = true
+
+  Pedant.config.suite = "api"
+
+  Pedant.config[:config_file] = "spec/support/oc_pedant.rb"
+
+  # 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",
+                      "--skip-user-keys",
+                    ]
+                  else
+                    []
+                  end
+
+  unless Gem::Requirement.new(">= 12.8.0").satisfied_by?(Gem::Version.new(Chef::VERSION))
+    chef_fs_skips << "--skip-keys"
+  end
+
+  unless Gem::Requirement.new(">= 12.13.19").satisfied_by?(Gem::Version.new(Chef::VERSION))
+    chef_fs_skips << "--skip-acl"
+    chef_fs_skips << "--skip-cookbook-artifacts"
+    chef_fs_skips << "--skip-policies"
+  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
+
+    # Chef Zero does not intend to support validation the way erchef does.
+    "--skip-validation",
+
+    # Chef Zero does not intend to support authentication the way erchef does.
+    "--skip-authentication",
+
+    # Chef Zero does not intend to support authorization the way erchef does.
+    "--skip-authorization",
+
+    # Chef Zero does not intend to support oc_id authentication/authorization
+    # the way erchef does.
+    "--skip-oc_id",
+
+    # Omnibus tests depend on erchef features that are specific to erchef and
+    # bundled in the omnibus package. Currently the only test in this category
+    # is for the search reindexing script.
+    "--skip-omnibus",
+
+    # USAGs (user-specific association groups) are Authz groups that contain
+    # only one user and represent that user's association with an org. Though
+    # there are good reasons for them, they don't work well in practice and
+    # only the manage console really uses them. Since Chef Zero + Manage is a
+    # quite unusual configuration, we're ignoring them.
+    "--skip-usags",
+
+    # Chef 12 features not yet 100% supported by Chef Zero
+
+    # 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. This is also used to skip the user acl
+    # tests from chef-server as the user acls are not supported in chef-zero
+    # at this time.
+    "--skip-chef-zero-quirks",
+
+    "--skip-status",
+    "--skip=email_case_insensitive",
+    "--skip=nginx_default_error",
+    "--skip=response_headers",
+  ]
+
+  # 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 + pedant_args_from_env)
+
+  rspec_args = Pedant.config.rspec_args + rspec_args_from_env
+
+  if defined? Chef::ChefFS::FileSystemCache
+    RSpec.configure do |c|
+      c.before(:each) do
+        Chef::ChefFS::FileSystemCache.instance.reset!
+      end
+    end
+  end
+
+  result = RSpec::Core::Runner.run(rspec_args)
+
+  server.stop if server.running?
+ensure
+  FileUtils.remove_entry_secure(tmpdir) if tmpdir
+end
+
+exit(result)

data/spec/search_spec.rb

@@ -1,36 +1,36 @@
-require "chef_zero/solr/solr_parser"
-require "chef_zero/solr/solr_doc"
-
-describe ChefZero::Solr::SolrParser do
-  let(:all_docs) do
-    docs = []
-    [{ "foo" => "a" },
-     { "foo" => "d" }].each_with_index do |h, i|
-       docs.push ChefZero::Solr::SolrDoc.new(h, i)
-     end
-    docs
-  end
-
-  def search_for(query)
-    q = ChefZero::Solr::SolrParser.new(query).parse
-    all_docs.select { |doc| q.matches_doc?(doc) }
-  end
-
-  it "handles terms" do
-    search_for("foo:d").size.should eq(1)
-  end
-
-  it "handles ranges" do
-    search_for("foo:[a TO c]").size.should eq(1)
-  end
-
-  it "handles -" do
-    search_for("-foo:a").size.should eq(1)
-  end
-
-  it "handles wildcard ranges" do
-    search_for("foo:[* TO c]").size.should eq(1)
-    search_for("foo:[c TO *]").size.should eq(1)
-    search_for("foo:[* TO *]").size.should eq(2)
-  end
-end
+require "chef_zero/solr/solr_parser"
+require "chef_zero/solr/solr_doc"
+
+describe ChefZero::Solr::SolrParser do
+  let(:all_docs) do
+    docs = []
+    [{ "foo" => "a" },
+     { "foo" => "d" }].each_with_index do |h, i|
+       docs.push ChefZero::Solr::SolrDoc.new(h, i)
+     end
+    docs
+  end
+
+  def search_for(query)
+    q = ChefZero::Solr::SolrParser.new(query).parse
+    all_docs.select { |doc| q.matches_doc?(doc) }
+  end
+
+  it "handles terms" do
+    search_for("foo:d").size.should eq(1)
+  end
+
+  it "handles ranges" do
+    search_for("foo:[a TO c]").size.should eq(1)
+  end
+
+  it "handles -" do
+    search_for("-foo:a").size.should eq(1)
+  end
+
+  it "handles wildcard ranges" do
+    search_for("foo:[* TO c]").size.should eq(1)
+    search_for("foo:[c TO *]").size.should eq(1)
+    search_for("foo:[* TO *]").size.should eq(2)
+  end
+end