chef 12.9.41 → 12.10.24

data/acceptance/fips/.kitchen.yml

@@ -1,4 +1,8 @@
 suites:
-  - name: fips
+  - name: fips-unit-functional
+    includes: [centos-6, windows-2012r2]
+    run_list:
+
+  - name: fips-integration
     includes: [centos-6, windows-2012r2]
     run_list:

data/acceptance/fips/test/integration/fips-integration/serverspec/fips-integration_spec.rb

@@ -0,0 +1,51 @@
+require "mixlib/shellout"
+require "bundler"
+
+describe "Chef Fips Integration Specs" do
+  def windows?
+    if RUBY_PLATFORM =~ /mswin|mingw|windows/
+      true
+    else
+      false
+    end
+  end
+
+  let(:omnibus_root) do
+    if windows?
+      "c:/opscode/chef"
+    else
+      "/opt/chef"
+    end
+  end
+
+  let(:env) do
+    {
+      "PATH" => [ "#{omnibus_root}/embedded/bin", ENV["PATH"] ].join(File::PATH_SEPARATOR),
+      "BUNDLE_GEMFILE" => "#{omnibus_root}/Gemfile",
+      "GEM_PATH" => nil, "GEM_CACHE" => nil, "GEM_HOME" => nil,
+      "BUNDLE_IGNORE_CONFIG" => "true",
+      "BUNDLE_FROZEN" => "1",
+      "CHEF_FIPS" => "1"
+    }
+  end
+
+  let(:chef_dir) do
+    cmd = Mixlib::ShellOut.new("bundle show chef", env: env).run_command
+    cmd.error!
+    cmd.stdout.chomp
+  end
+
+  def run_rspec_test(test)
+    Bundler.with_clean_env do
+      cmd = Mixlib::ShellOut.new(
+        "bundle exec rspec -f documentation -t ~requires_git #{test}",
+        env: env, cwd: chef_dir, timeout: 3600
+      )
+      cmd.run_command.error!
+    end
+  end
+
+  it "passes the integration specs" do
+    run_rspec_test("spec/integration")
+  end
+end

data/acceptance/fips/test/integration/fips-unit-functional/serverspec/Gemfile

@@ -0,0 +1,3 @@
+source "https://rubygems.org"
+
+gem "mixlib-shellout"

data/acceptance/fips/test/integration/fips-unit-functional/serverspec/fips-unit-functional_spec.rb

@@ -0,0 +1,56 @@
+require "mixlib/shellout"
+require "bundler"
+
+describe "Chef Fips Unit/Functional Specs" do
+  def windows?
+    if RUBY_PLATFORM =~ /mswin|mingw|windows/
+      true
+    else
+      false
+    end
+  end
+
+  let(:omnibus_root) do
+    if windows?
+      "c:/opscode/chef"
+    else
+      "/opt/chef"
+    end
+  end
+
+  let(:env) do
+    {
+      "PATH" => [ "#{omnibus_root}/embedded/bin", ENV["PATH"] ].join(File::PATH_SEPARATOR),
+      "BUNDLE_GEMFILE" => "#{omnibus_root}/Gemfile",
+      "GEM_PATH" => nil, "GEM_CACHE" => nil, "GEM_HOME" => nil,
+      "BUNDLE_IGNORE_CONFIG" => "true",
+      "BUNDLE_FROZEN" => "1",
+      "CHEF_FIPS" => "1"
+    }
+  end
+
+  let(:chef_dir) do
+    cmd = Mixlib::ShellOut.new("bundle show chef", env: env).run_command
+    cmd.error!
+    cmd.stdout.chomp
+  end
+
+  def run_rspec_test(test)
+    Bundler.with_clean_env do
+      cmd = Mixlib::ShellOut.new(
+        "bundle exec rspec -f documentation -t ~requires_git #{test}",
+        env: env, cwd: chef_dir, timeout: 3600
+      )
+      cmd.run_command.error!
+    end
+  end
+
+  it "passes the unit specs" do
+    run_rspec_test("spec/unit")
+  end
+
+  it "passes the functional specs" do
+    run_rspec_test("spec/functional")
+  end
+
+end

data/chef.gemspec

@@ -50,12 +50,6 @@ Gem::Specification.new do |s|
   # very deliberately avoiding putting a ceiling on this to avoid depsolver conflicts.
   s.add_dependency "bundler", ">= 1.10"
 
-  s.add_development_dependency "rack"
-  s.add_development_dependency "cheffish", ">= 1.1", "< 3.0"
-  s.add_development_dependency "github_changelog_generator", "1.11.3"
-
-  s.add_development_dependency "rake", "~> 10.1"
-
   s.bindir       = "bin"
   s.executables  = %w{ chef-client chef-solo knife chef-shell chef-apply }
 

data/lib-backcompat/chef/chef_fs/file_system/repository/chef_repository_file_system_acls_dir.rb

@@ -0,0 +1,5 @@
+require "chef/chef_fs/file_system/repository/acls_dir"
+
+module Chef::ChefFS::FileSystem::Repository
+  ChefRepositoryFileSystemAclsDir = AclsDir
+end

data/lib-backcompat/chef/chef_fs/file_system/repository/chef_repository_file_system_client_keys_dir.rb

@@ -0,0 +1,5 @@
+require "chef/chef_fs/file_system/repository/client_keys_dir"
+
+module Chef::ChefFS::FileSystem::Repository
+  ChefRepositoryFileSystemClientKeysDir = ClientKeysDir
+end

data/lib-backcompat/chef/chef_fs/file_system/repository/chef_repository_file_system_entry.rb

@@ -0,0 +1,6 @@
+require "chef/chef_fs/file_system/repository/file_system_entry"
+
+module Chef::ChefFS::FileSystem::Repository
+  Chef.log_deprecation "Chef::ChefFS::FileSystem::Repository::ChefRepositoryFileSystemEntry is deprecated. Please use FileSystemEntry directly"
+  ChefRepositoryFileSystemEntry = FileSystemEntry
+end

data/lib-backcompat/chef/chef_fs/file_system/repository/chef_repository_file_system_policies_dir.rb

@@ -0,0 +1,5 @@
+require "chef/chef_fs/file_system/repository/policies_dir"
+
+module Chef::ChefFS::FileSystem::Repository
+  ChefRepositoryFileSystemPoliciesDir = PoliciesDir
+end

data/{lib → lib-backcompat}/chef/chef_fs/file_system/repository/file_system_root_dir.rb

@@ -24,6 +24,7 @@ class Chef
       module Repository
         class FileSystemRootDir < FileSystemEntry
           def initialize(file_path)
+            Chef.log_deprecation "Chef::ChefFS::FileSystem::Repository::FileSystemRootDir is deprecated."
             super("", nil, file_path)
           end
         end

data/lib/chef/chef_fs/file_system/repository/acl.rb

@@ -0,0 +1,38 @@
+#
+# Author:: Thom May (<thom@chef.io>)
+# Copyright:: Copyright 2013-2016, Chef Software Inc.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require "chef/chef_fs/data_handler/acl_data_handler"
+require "chef/chef_fs/file_system/repository/base_file"
+
+class Chef
+  module ChefFS
+    module FileSystem
+      module Repository
+
+        class Acl < BaseFile
+
+          def initialize(name, parent)
+            @data_handler = Chef::ChefFS::DataHandler::AclDataHandler.new
+            super
+          end
+
+        end
+      end
+    end
+  end
+end

data/lib/chef/chef_fs/file_system/repository/{chef_repository_file_system_acls_dir.rb → acls_dir.rb}

@@ -16,7 +16,9 @@
 # limitations under the License.
 #
 
-require "chef/chef_fs/file_system/repository/chef_repository_file_system_entry"
+require "chef/chef_fs/file_system/repository/acl"
+require "chef/chef_fs/file_system/repository/directory"
+require "chef/chef_fs/file_system/repository/acls_sub_dir"
 require "chef/chef_fs/file_system/chef_server/acls_dir"
 require "chef/chef_fs/data_handler/acl_data_handler"
 
@@ -24,14 +26,21 @@ class Chef
   module ChefFS
     module FileSystem
       module Repository
-        class ChefRepositoryFileSystemAclsDir < ChefRepositoryFileSystemEntry
-          def initialize(name, parent, path = nil)
-            super(name, parent, path, Chef::ChefFS::DataHandler::AclDataHandler.new)
-          end
+        class AclsDir < Repository::Directory
 
           def can_have_child?(name, is_dir)
             is_dir ? Chef::ChefFS::FileSystem::ChefServer::AclsDir::ENTITY_TYPES.include?(name) : name == "organization.json"
           end
+
+          protected
+
+          def make_child_entry(child_name)
+            if child_name == "organization.json"
+              Acl.new(child_name, self)
+            else
+              AclsSubDir.new(child_name, self)
+            end
+          end
         end
       end
     end

data/lib/chef/chef_fs/file_system/repository/acls_sub_dir.rb

@@ -0,0 +1,42 @@
+#
+# Author:: Jordan Running (<jr@chef.io>)
+# Copyright:: Copyright 2013-2016, Chef Software Inc.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require "chef/chef_fs/file_system/repository/acl"
+require "chef/chef_fs/data_handler/acl_data_handler"
+require "chef/chef_fs/file_system/repository/directory"
+
+class Chef
+  module ChefFS
+    module FileSystem
+      module Repository
+        class AclsSubDir < Repository::Directory
+
+          def can_have_child?(name, is_dir)
+            !is_dir && File.extname(name) == ".json"
+          end
+
+          protected
+
+          def make_child_entry(child_name)
+            Acl.new(child_name, self)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/chef/chef_fs/file_system/repository/base_file.rb

@@ -0,0 +1,120 @@
+#
+# Author:: Thom May (<thom@chef.io>)
+# Copyright:: Copyright 2013-2016, Chef Software Inc.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+class Chef
+  module ChefFS
+    module FileSystem
+      module Repository
+
+        class BaseFile
+
+          attr_reader :name
+          attr_reader :parent
+          attr_reader :path
+          attr_reader :file_path
+          attr_reader :data_handler
+
+          def initialize(name, parent)
+            @parent = parent
+            @name = name
+            @path = Chef::ChefFS::PathUtils.join(parent.path, name)
+            @file_path = "#{parent.file_path}/#{name}"
+          end
+
+          def dir?
+            false
+          end
+
+          def is_json_file?
+            File.extname(name) == ".json"
+          end
+
+          def name_valid?
+            !name.start_with?(".") && is_json_file?
+          end
+
+          def fs_entry_valid?
+            name_valid? && exists?
+          end
+
+          def create(file_contents)
+            if exists?
+              raise Chef::ChefFS::FileSystem::AlreadyExistsError.new(:create_child, self)
+            else
+              write(file_contents)
+            end
+          end
+
+          def can_have_child?(name, is_dir)
+            false
+          end
+
+          attr_writer :write_pretty_json
+          def write_pretty_json
+            @write_pretty_json.nil? ? root.write_pretty_json : @write_pretty_json
+          end
+
+          def path_for_printing
+            file_path
+          end
+
+          def delete(_)
+            File.delete(file_path)
+          rescue Errno::ENOENT
+            raise Chef::ChefFS::FileSystem::NotFoundError.new(self, $!)
+          end
+
+          def exists?
+            File.file?(file_path)
+          end
+
+          def minimize(content, entry)
+            object = Chef::JSONCompat.parse(content)
+            object = data_handler.normalize(object, entry)
+            object = data_handler.minimize(object, entry)
+            Chef::JSONCompat.to_json_pretty(object)
+          end
+
+          def read
+            File.open(file_path, "rb") { |f| f.read }
+          rescue Errno::ENOENT
+            raise Chef::ChefFS::FileSystem::NotFoundError.new(self, $!)
+          end
+
+          def write(content)
+            if content && write_pretty_json && is_json_file?
+              content = minimize(content, self)
+            end
+            File.open(file_path, "wb") do |file|
+              file.write(content)
+            end
+          end
+
+          def root
+            parent.root
+          end
+
+          def compare_to(other)
+            nil
+          end
+
+        end
+      end
+    end
+  end
+end

data/lib/chef/chef_fs/file_system/repository/chef_repository_file_system_cookbook_entry.rb

@@ -16,7 +16,7 @@
 # limitations under the License.
 #
 
-require "chef/chef_fs/file_system/repository/chef_repository_file_system_entry"
+require "chef/chef_fs/file_system/repository/file_system_entry"
 require "chef/chef_fs/file_system/repository/cookbooks_dir"
 require "chef/chef_fs/file_system/exceptions"