chef 12.0.0.alpha.0 → 12.0.0.alpha.1

data/spec/integration/recipes/lwrp_inline_resources_spec.rb

@@ -2,7 +2,7 @@ require 'support/shared/integration/integration_helper'
 require 'chef/mixin/shell_out'
 
 describe "LWRPs with inline resources" do
-  extend IntegrationSupport
+  include IntegrationSupport
   include Chef::Mixin::ShellOut
 
   let(:chef_dir) { File.join(File.dirname(__FILE__), "..", "..", "..", "bin") }
@@ -19,22 +19,23 @@ describe "LWRPs with inline resources" do
   let(:chef_client) { "ruby #{chef_dir}/chef-client" }
 
   when_the_repository "has a cookbook with a nested LWRP" do
-  	directory 'cookbooks/x' do
+    before do
+      directory 'cookbooks/x' do
 
-      file 'resources/do_nothing.rb', <<EOM
+        file 'resources/do_nothing.rb', <<EOM
 actions :create, :nothing
 default_action :create
 EOM
-      file 'providers/do_nothing.rb', <<EOM
+        file 'providers/do_nothing.rb', <<EOM
 action :create do
 end
 EOM
 
-  	  file 'resources/my_machine.rb', <<EOM
+        file 'resources/my_machine.rb', <<EOM
 actions :create, :nothing
 default_action :create
 EOM
-      file 'providers/my_machine.rb', <<EOM
+        file 'providers/my_machine.rb', <<EOM
 use_inline_resources
 action :create do
   x_do_nothing 'a'
@@ -42,12 +43,13 @@ action :create do
 end
 EOM
 
-  	  file 'recipes/default.rb', <<EOM
+        file 'recipes/default.rb', <<EOM
 x_my_machine "me"
 x_my_machine "you"
 EOM
 
-  	end # directory 'cookbooks/x'
+      end # directory 'cookbooks/x'
+    end
 
     it "should complete with success" do
       file 'config/client.rb', <<EOM

data/spec/integration/solo/solo_spec.rb

@@ -6,14 +6,20 @@ require 'timeout'
 require 'fileutils'
 
 describe "chef-solo" do
-  extend IntegrationSupport
+  include IntegrationSupport
   include Chef::Mixin::ShellOut
 
   let(:chef_dir) { File.join(File.dirname(__FILE__), "..", "..", "..") }
 
+  let(:cookbook_x_100_metadata_rb) { cb_metadata("x", "1.0.0") }
+
+  let(:cookbook_ancient_100_metadata_rb) { cb_metadata("ancient", "1.0.0") }
+
   when_the_repository "has a cookbook with a basic recipe" do
-    file 'cookbooks/x/metadata.rb', 'version "1.0.0"'
-    file 'cookbooks/x/recipes/default.rb', 'puts "ITWORKS"'
+    before do
+      file 'cookbooks/x/metadata.rb', cookbook_x_100_metadata_rb
+      file 'cookbooks/x/recipes/default.rb', 'puts "ITWORKS"'
+    end
 
     it "should complete with success" do
       file 'config/solo.rb', <<EOM
@@ -43,11 +49,13 @@ E
   end
 
   when_the_repository "has a cookbook with an undeclared dependency" do
-    file 'cookbooks/x/metadata.rb', 'version "1.0.0"'
-    file 'cookbooks/x/recipes/default.rb', 'include_recipe "ancient::aliens"'
+    before do
+      file 'cookbooks/x/metadata.rb', cookbook_x_100_metadata_rb
+      file 'cookbooks/x/recipes/default.rb', 'include_recipe "ancient::aliens"'
 
-    file 'cookbooks/ancient/metadata.rb', 'version "1.0.0"'
-    file 'cookbooks/ancient/recipes/aliens.rb', 'print "it was aliens"'
+      file 'cookbooks/ancient/metadata.rb', cookbook_ancient_100_metadata_rb
+      file 'cookbooks/ancient/recipes/aliens.rb', 'print "it was aliens"'
+    end
 
     it "should exit with an error" do
       file 'config/solo.rb', <<EOM
@@ -62,16 +70,19 @@ EOM
 
 
   when_the_repository "has a cookbook with a recipe with sleep" do
-    directory 'logs'
-    file 'logs/runs.log', ''
-    file 'cookbooks/x/metadata.rb', 'version "1.0.0"'
-    file 'cookbooks/x/recipes/default.rb', <<EOM
+    before do
+      directory 'logs'
+      file 'logs/runs.log', ''
+      file 'cookbooks/x/metadata.rb', cookbook_x_100_metadata_rb
+      file 'cookbooks/x/recipes/default.rb', <<EOM
 ruby_block "sleeping" do
   block do
     sleep 5
   end
 end
 EOM
+    end
+
     # Ruby 1.8.7 doesn't have Process.spawn :(
     it "while running solo concurrently", :ruby_gte_19_only => true do
       file 'config/solo.rb', <<EOM

data/spec/spec_helper.rb

@@ -124,6 +124,9 @@ RSpec.configure do |config|
   config.filter_run_excluding :requires_root_or_running_windows => true unless (root? || windows?)
   config.filter_run_excluding :requires_unprivileged_user => true if root?
   config.filter_run_excluding :uses_diff => true unless has_diff?
+  config.filter_run_excluding :ruby_gte_20_and_openssl_gte_101 => true unless (ruby_gte_20? && openssl_gte_101?)
+  config.filter_run_excluding :openssl_lt_101 => true unless openssl_lt_101?
+  config.filter_run_excluding :ruby_lt_20 => true unless ruby_lt_20?
 
   running_platform_arch = `uname -m`.strip
 

data/spec/support/lib/chef/resource/zen_follower.rb

@@ -0,0 +1,46 @@
+#
+# Copyright:: Copyright (c) 2014 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/knife'
+require 'chef/json_compat'
+
+class Chef
+  class Resource
+    class ZenFollower < Chef::Resource
+      attr_accessor :created_as_type
+
+      provides :follower, :on_platforms => ["zen"]
+
+      def initialize(name, run_context=nil)
+        @resource_name = :zen_follower
+        @created_as_type = "zen_follower"
+        super
+      end
+
+      def to_s
+        "#{created_as_type}[#{name}]"
+      end
+
+      def master(arg=nil)
+        if !arg.nil?
+          @master = arg
+        end
+        @master
+      end
+    end
+  end
+end

data/spec/support/platform_helpers.rb

@@ -7,6 +7,10 @@ def ruby_gte_20?
   RUBY_VERSION.to_f >= 2.0
 end
 
+def ruby_lt_20?
+  !ruby_gte_20?
+end
+
 def ruby_gte_19?
   RUBY_VERSION.to_f >= 1.9
 end
@@ -129,3 +133,11 @@ def root?
   return false if windows?
   Process.euid == 0
 end
+
+def openssl_gte_101?
+  OpenSSL::OPENSSL_VERSION_NUMBER >= 10001000
+end
+
+def openssl_lt_101?
+  !openssl_gte_101?
+end

data/spec/support/shared/functional/file_resource.rb

@@ -96,6 +96,16 @@ shared_examples_for "a file with the wrong content" do
           selinux_security_context_restored?(path).should be_true
         end
       end
+
+      context "with a checksum that does not match the content to deploy" do
+        before do
+          resource.checksum("aAaAaAaAaAaAaAaAaAaAaAaAaAaAaAaAaAaAaAaAaAaAaAaAaAaAaAaAaAaAaAaA")
+        end
+
+        it "raises an exception" do
+          expect{ resource.run_action(:create) }.to raise_error(Chef::Exceptions::ChecksumMismatch)
+        end
+      end
     end
 
     describe "when running action :create_if_missing" do

data/spec/support/shared/integration/chef_zero_support.rb

@@ -0,0 +1,130 @@
+require 'tempfile'
+require 'chef_zero/server'
+require 'chef_zero/rest_request'
+
+# This is a copy of chef_zero/rspec, modified to implement contextual
+# helpers as instance_methods rather than class methods. This makes it
+# possible to use them with let bindings and other RSpec code reuse
+# mechanisms.
+#
+# Unfortunately, at the time of this writing, chef-zero master doesn't
+# work for our rspec tests, so in the interests of making forward
+# progress, we're using a modified version of the chef_zero/rspec code
+# here.
+#
+# This file should be entirely replaced by chef_zero/rspec once these
+# issues are fixed.
+module ChefZeroSupport
+  module Server
+
+    def self.server
+      @server
+    end
+    def self.server=(value)
+      @server = value
+    end
+    def self.client_key
+      @client_key
+    end
+    def self.client_key=(value)
+      @client_key = value
+    end
+    def self.request_log
+      @request_log ||= []
+    end
+    def self.clear_request_log
+      @request_log = []
+    end
+
+  end
+
+  def client(name, client)
+    ChefZeroSupport::Server.server.load_data({ 'clients' => { name => client }})
+  end
+
+  def cookbook(name, version, cookbook = {}, options = {})
+
+    auto_metadata = "name '#{name}'; version '#{version}'"
+
+    cookbook["metadata.rb"] ||= auto_metadata
+
+    ChefZeroSupport::Server.server.load_data({ 'cookbooks' => { "#{name}-#{version}" => cookbook.merge(options) }})
+  end
+
+  def data_bag(name, data_bag)
+    ChefZeroSupport::Server.server.load_data({ 'data' => { name => data_bag }})
+  end
+
+  def environment(name, environment)
+    ChefZeroSupport::Server.server.load_data({ 'environments' => { name => environment }})
+  end
+
+  def node(name, node)
+    ChefZeroSupport::Server.server.load_data({ 'nodes' => { name => node }})
+  end
+
+  def role(name, role)
+    ChefZeroSupport::Server.server.load_data({ 'roles' => { name => role }})
+  end
+
+  def user(name, user)
+    ChefZeroSupport::Server.server.load_data({ 'users' => { name => user }})
+  end
+
+  RSpec.shared_context "With chef-zero running" do
+    before :each do
+
+      default_opts = {:port => 8900, :signals => false, :log_requests => true}
+      server_opts = if self.respond_to?(:chef_zero_opts)
+        default_opts.merge(chef_zero_opts)
+      else
+        default_opts
+      end
+
+      if ChefZeroSupport::Server.server && server_opts.any? { |opt, value| ChefZeroSupport::Server.server.options[opt] != value }
+        ChefZeroSupport::Server.server.stop
+        ChefZeroSupport::Server.server = nil
+      end
+
+      unless ChefZeroSupport::Server.server
+        # TODO: can this be logged easily?
+        # pp :zero_opts => server_opts
+
+        # Set up configuration so that clients will point to the server
+        ChefZeroSupport::Server.server = ChefZero::Server.new(server_opts)
+        ChefZeroSupport::Server.client_key = Tempfile.new(['chef_zero_client_key', '.pem'])
+        ChefZeroSupport::Server.client_key.write(ChefZero::PRIVATE_KEY)
+        ChefZeroSupport::Server.client_key.close
+        # Start the server
+        ChefZeroSupport::Server.server.start_background
+        ChefZeroSupport::Server.server.on_response do |request, response|
+          ChefZeroSupport::Server.request_log << [ request, response ]
+        end
+      else
+        ChefZeroSupport::Server.server.clear_data
+      end
+      ChefZeroSupport::Server.clear_request_log
+
+      if defined?(Chef::Config)
+        @old_chef_server_url = Chef::Config.chef_server_url
+        @old_node_name = Chef::Config.node_name
+        @old_client_key = Chef::Config.client_key
+        Chef::Config.chef_server_url = ChefZeroSupport::Server.server.url
+        Chef::Config.node_name = 'admin'
+        Chef::Config.client_key = ChefZeroSupport::Server.client_key.path
+        Chef::Config.http_retry_count = 0
+      end
+    end
+
+    if defined?(Chef::Config)
+      after :each do
+        Chef::Config.chef_server_url = @old_chef_server_url
+        Chef::Config.node_name = @old_node_name
+        Chef::Config.client_key = @old_client_key
+      end
+    end
+
+  end
+
+end
+

data/spec/support/shared/integration/integration_helper.rb

@@ -20,131 +20,133 @@
 require 'tmpdir'
 require 'fileutils'
 require 'chef/config'
-require 'chef_zero/rspec'
-require 'json'
+
+# Temporarily use our own copy of chef-zero rspec integration.
+# See support/shared/integration/chef_zero_support for details
+#require 'chef_zero/rspec'
+require 'support/shared/integration/chef_zero_support'
+
+require 'chef/json_compat'
 require 'support/shared/integration/knife_support'
 require 'support/shared/integration/app_server_support'
 require 'spec_helper'
 
 module IntegrationSupport
-  include ChefZero::RSpec
-
-  def when_the_repository(description, *args, &block)
-    context "When the local repository #{description}", *args do
-      before :each do
-        raise "Can only create one directory per test" if @repository_dir
-        @repository_dir = Dir.mktmpdir('chef_repo')
-        Chef::Config.chef_repo_path = @repository_dir
-        %w(client cookbook data_bag environment node role user).each do |object_name|
-          Chef::Config.delete("#{object_name}_path".to_sym)
-        end
-      end
+  include ChefZeroSupport
 
-      after :each do
-        if @repository_dir
-          begin
-            %w(client cookbook data_bag environment node role user).each do |object_name|
-              Chef::Config.delete("#{object_name}_path".to_sym)
-            end
-            Chef::Config.delete(:chef_repo_path)
-            FileUtils.remove_entry_secure(@repository_dir)
-          ensure
-            @repository_dir = nil
-          end
-        end
-      end
+  module ClassMethods
 
-      def directory(relative_path, &block)
-        old_parent_path = @parent_path
-        @parent_path = path_to(relative_path)
-        FileUtils.mkdir_p(@parent_path)
-        instance_eval(&block) if block
-        @parent_path = old_parent_path
+    def when_the_chef_server(desc, *tags, &block)
+      context("when the chef server #{desc}", *tags) do
+        #include ChefZero::RSpec::Fixtures
+        include_context "With chef-zero running"
+        module_eval(&block)
       end
+    end
 
-      def file(relative_path, contents)
-        filename = path_to(relative_path)
-        dir = File.dirname(filename)
-        FileUtils.mkdir_p(dir) unless dir == '.'
-        File.open(filename, 'w') do |file|
-          raw = case contents
-                when Hash
-                  JSON.pretty_generate(contents)
-                when Array
-                  contents.join("\n")
-                else
-                  contents
-                end
-          file.write(raw)
-        end
+    def when_the_repository(desc, *tags, &block)
+      context("when the chef repo #{desc}", *tags) do
+        include_context "with a chef repo"
+        module_eval(&block)
       end
+    end
 
-      def symlink(relative_path, relative_dest)
-        filename = path_to(relative_path)
-        dir = File.dirname(filename)
-        FileUtils.mkdir_p(dir) unless dir == '.'
-        dest_filename = path_to(relative_dest)
-        File.symlink(dest_filename, filename)
+    def with_versioned_cookbooks(&block)
+      context("with versioned cookbooks") do
+        include_context "with versioned cookbooks"
+        module_eval(&block)
       end
+    end
+  end
 
-      def path_to(relative_path)
-        File.expand_path(relative_path, (@parent_path || @repository_dir))
-      end
+  def self.included(includer_class)
+    includer_class.extend(ClassMethods)
+  end
 
-      def self.path_to(relative_path)
-        File.expand_path(relative_path, (@parent_path || @repository_dir))
-      end
+  def directory(relative_path, &block)
+    old_parent_path = @parent_path
+    @parent_path = path_to(relative_path)
+    FileUtils.mkdir_p(@parent_path)
+    instance_eval(&block) if block
+    @parent_path = old_parent_path
+  end
 
-      def self.directory(relative_path, &block)
-        before :each do
-          directory(relative_path, &block)
-        end
-      end
+  def file(relative_path, contents)
+    filename = path_to(relative_path)
+    dir = File.dirname(filename)
+    FileUtils.mkdir_p(dir) unless dir == '.'
+    File.open(filename, 'w') do |file|
+      raw = case contents
+            when Hash
+              JSON.pretty_generate(contents)
+            when Array
+              contents.join("\n")
+            else
+              contents
+            end
+      file.write(raw)
+    end
+  end
 
-      def self.file(relative_path, contents)
-        before :each do
-          file(relative_path, contents)
-        end
-      end
+  def symlink(relative_path, relative_dest)
+    filename = path_to(relative_path)
+    dir = File.dirname(filename)
+    FileUtils.mkdir_p(dir) unless dir == '.'
+    dest_filename = path_to(relative_dest)
+    File.symlink(dest_filename, filename)
+  end
 
-      def self.symlink(relative_path, relative_dest)
-        before :each do
-          symlink(relative_path, relative_dest)
-        end
+  def path_to(relative_path)
+    File.expand_path(relative_path, (@parent_path || @repository_dir))
+  end
+
+  def cb_metadata(name, version, extra_text="")
+    "name '#{name}'; version '#{version}'#{extra_text}"
+  end
+
+  def cwd(relative_path)
+    @old_cwd = Dir.pwd
+    Dir.chdir(path_to(relative_path))
+  end
+
+  RSpec.shared_context "with a chef repo" do
+    before :each do
+      raise "Can only create one directory per test" if @repository_dir
+      @repository_dir = Dir.mktmpdir('chef_repo')
+      Chef::Config.chef_repo_path = @repository_dir
+      %w(client cookbook data_bag environment node role user).each do |object_name|
+        Chef::Config.delete("#{object_name}_path".to_sym)
       end
+    end
 
-      def self.cwd(relative_path)
-        before :each do
-          @old_cwd = Dir.pwd
-          Dir.chdir(path_to(relative_path))
-        end
-        after :each do
-          Dir.chdir(@old_cwd)
+    after :each do
+      if @repository_dir
+        begin
+          %w(client cookbook data_bag environment node role user).each do |object_name|
+            Chef::Config.delete("#{object_name}_path".to_sym)
+          end
+          Chef::Config.delete(:chef_repo_path)
+          FileUtils.remove_entry_secure(@repository_dir)
+        ensure
+          @repository_dir = nil
         end
       end
-
-      instance_eval(&block)
+      Dir.chdir(@old_cwd) if @old_cwd
     end
+
   end
 
   # Versioned cookbooks
 
-  def with_versioned_cookbooks(_metadata = {}, &block)
-    _m = { :versioned_cookbooks => true }.merge(_metadata)
-    context 'with versioned cookbooks', _m do
-      before(:each) { Chef::Config[:versioned_cookbooks] = true }
-      after(:each)  { Chef::Config.delete(:versioned_cookbooks) }
-      instance_eval(&block)
-    end
+  RSpec.shared_context 'with versioned cookbooks', :versioned_cookbooks => true do
+    before(:each) { Chef::Config[:versioned_cookbooks] = true }
+    after(:each)  { Chef::Config.delete(:versioned_cookbooks) }
   end
 
-  def without_versioned_cookbooks(_metadata = {}, &block)
-    _m = { :versioned_cookbooks => false }.merge(_metadata)
-    context 'with versioned cookbooks', _m do
-      # Just make sure this goes back to default
-      before(:each) { Chef::Config[:versioned_cookbooks] = false }
-      after(:each)  { Chef::Config.delete(:versioned_cookbooks) }
-      instance_eval(&block)
-    end
+  RSpec.shared_context "without versioned cookbooks", :versioned_cookbooks => false do
+    # Just make sure this goes back to default
+    before(:each) { Chef::Config[:versioned_cookbooks] = false }
+    after(:each)  { Chef::Config.delete(:versioned_cookbooks) }
   end
+
 end