chef 11.12.8 → 11.14.0.alpha.2

data/lib/chef/version.rb

@@ -1,4 +1,4 @@
-#
+
 # Author:: Daniel DeLeo (<dan@opscode.com>)
 # Copyright:: Copyright (c) 2010-2011 Opscode, Inc.
 # License:: Apache License, Version 2.0
@@ -17,7 +17,7 @@
 
 class Chef
   CHEF_ROOT = File.dirname(File.expand_path(File.dirname(__FILE__)))
-  VERSION = '11.12.8'
+  VERSION = '11.14.0.alpha.2'
 end
 
 # NOTE: the Chef::Version class is defined in version_class.rb

data/spec/functional/http/simple_spec.rb

@@ -0,0 +1,84 @@
+#
+# Author:: Lamont Granquist (<lamont@getchef.com>)
+# 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 'spec_helper'
+require 'tiny_server'
+require 'support/shared/functional/http'
+
+describe Chef::HTTP::Simple do
+  include ChefHTTPShared
+
+  let(:http_client) { described_class.new(source) }
+  let(:http_client_disable_gzip) { described_class.new(source, { :disable_gzip => true } ) }
+
+  before(:all) do
+    start_tiny_server
+  end
+
+  after(:all) do
+    stop_tiny_server
+  end
+
+  shared_examples_for "downloads requests correctly" do
+    it "successfully downloads a streaming request" do
+      tempfile = http_client.streaming_request(source, {})
+      tempfile.close
+      expect(Digest::MD5.hexdigest(binread(tempfile.path))).to eq(Digest::MD5.hexdigest(expected_content))
+    end
+    it "successfully does a non-streaming GET request" do
+      expect(Digest::MD5.hexdigest(http_client.get(source))).to eq(Digest::MD5.hexdigest(expected_content))
+    end
+  end
+
+  shared_examples_for "validates content length and throws an exception" do
+    it "successfully downloads a streaming request" do
+      expect { http_client.streaming_request(source) }.to raise_error(Chef::Exceptions::ContentLengthMismatch)
+    end
+    it "successfully does a non-streaming GET request" do
+      expect { http_client.get(source) }.to raise_error(Chef::Exceptions::ContentLengthMismatch)
+    end
+  end
+
+  shared_examples_for "an endpoint that 403s" do
+    it "fails with a Net::HTTPServerException for a streaming request" do
+      expect { http_client.streaming_request(source) }.to raise_error(Net::HTTPServerException)
+    end
+
+    it "fails with a Net::HTTPServerException for a GET request" do
+      expect { http_client.get(source) }.to raise_error(Net::HTTPServerException)
+    end
+  end
+
+  # see CHEF-5100
+  shared_examples_for "a 403 after a successful request when reusing the request object" do
+    it "fails with a Net::HTTPServerException for a streaming request" do
+      tempfile = http_client.streaming_request(source)
+      tempfile.close
+      expect(Digest::MD5.hexdigest(binread(tempfile.path))).to eq(Digest::MD5.hexdigest(expected_content))
+      expect { http_client.streaming_request(source2) }.to raise_error(Net::HTTPServerException)
+    end
+
+    it "fails with a Net::HTTPServerException for a GET request" do
+      expect(Digest::MD5.hexdigest(http_client.get(source))).to eq(Digest::MD5.hexdigest(expected_content))
+      expect { http_client.get(source2) }.to raise_error(Net::HTTPServerException)
+    end
+  end
+
+  it_behaves_like "downloading all the things"
+end
+

data/spec/functional/resource/remote_file_spec.rb

@@ -18,8 +18,10 @@
 
 require 'spec_helper'
 require 'tiny_server'
+require 'support/shared/functional/http'
 
 describe Chef::Resource::RemoteFile do
+  include ChefHTTPShared
 
   let(:file_cache_path) { Dir.mktmpdir }
 
@@ -52,28 +54,6 @@ describe Chef::Resource::RemoteFile do
 
   let(:default_mode) { ((0100666 - File.umask) & 07777).to_s(8) }
 
-  def start_tiny_server(server_opts={})
-    @server = TinyServer::Manager.new(server_opts)
-    @server.start
-    @api = TinyServer::API.instance
-    @api.clear
-    @api.get("/nyan_cat.png", 200) {
-      File.open(File.join(CHEF_SPEC_DATA, 'remote_file', 'nyan_cat.png'), "rb") do |f|
-        f.read
-      end
-    }
-    @api.get("/nyan_cat.png.gz", 200, nil, { 'Content-Type' => 'application/gzip', 'Content-Encoding' => 'gzip' } ) {
-      File.open(File.join(CHEF_SPEC_DATA, 'remote_file', 'nyan_cat.png.gz'), "rb") do |f|
-        f.read
-      end
-    }
-  end
-
-  def stop_tiny_server
-    @server.stop
-    @server = @api = nil
-  end
-
   context "when fetching files over HTTP" do
     before(:all) do
       start_tiny_server
@@ -98,13 +78,7 @@ describe Chef::Resource::RemoteFile do
 
     context "when using normal encoding" do
       let(:source) { 'http://localhost:9000/nyan_cat.png' }
-      let(:expected_content) do
-        content = File.open(File.join(CHEF_SPEC_DATA, 'remote_file', 'nyan_cat.png'), "rb") do |f|
-          f.read
-        end
-        content.force_encoding(Encoding::BINARY) if content.respond_to?(:force_encoding)
-        content
-      end
+      let(:expected_content) { binread(nyan_uncompressed_filename) }
 
       it_behaves_like "a file resource"
 
@@ -113,13 +87,7 @@ describe Chef::Resource::RemoteFile do
 
     context "when using gzip encoding" do
       let(:source) { 'http://localhost:9000/nyan_cat.png.gz' }
-      let(:expected_content) do
-        content = File.open(File.join(CHEF_SPEC_DATA, 'remote_file', 'nyan_cat.png.gz'), "rb") do |f|
-          f.read
-        end
-        content.force_encoding(Encoding::BINARY) if content.respond_to?(:force_encoding)
-        content
-      end
+      let(:expected_content) { binread(nyan_compressed_filename) }
 
       it_behaves_like "a file resource"
 
@@ -150,16 +118,112 @@ describe Chef::Resource::RemoteFile do
 
     let(:source) { 'https://localhost:9000/nyan_cat.png' }
 
-    let(:expected_content) do
-      content = File.open(File.join(CHEF_SPEC_DATA, 'remote_file', 'nyan_cat.png'), "rb") do |f|
-        f.read
-      end
-      content.force_encoding(Encoding::BINARY) if content.respond_to?(:force_encoding)
-      content
-    end
+    let(:expected_content) { binread(nyan_uncompressed_filename) }
 
     it_behaves_like "a file resource"
 
   end
 
+  context "when dealing with content length checking" do
+    before(:all) do
+      start_tiny_server
+    end
+
+    after(:all) do
+      stop_tiny_server
+    end
+
+    context "when downloading compressed data" do
+      let(:expected_content) { binread(nyan_uncompressed_filename) }
+      let(:source) { 'http://localhost:9000/nyan_cat_content_length_compressed.png' }
+
+      before do
+        File.should_not exist(path)
+        resource.run_action(:create)
+      end
+
+      it "should create the file" do
+        File.should exist(path)
+      end
+
+      it "should mark the resource as updated" do
+        resource.should be_updated_by_last_action
+      end
+
+      it "has the correct content" do
+        binread(path).should == expected_content
+      end
+    end
+
+    context "when downloding uncompressed data" do
+      let(:expected_content) { binread(nyan_uncompressed_filename) }
+      let(:source) { 'http://localhost:9000/nyan_cat_content_length.png' }
+
+      before do
+        File.should_not exist(path)
+        resource.run_action(:create)
+      end
+
+      it "should create the file" do
+        File.should exist(path)
+      end
+
+      it "should mark the resource as updated" do
+        resource.should be_updated_by_last_action
+      end
+
+      it "has the correct content" do
+        binread(path).should == expected_content
+      end
+    end
+
+    context "when downloading truncated compressed data" do
+      let(:source) { 'http://localhost:9000/nyan_cat_truncated_compressed.png' }
+
+      before do
+        File.should_not exist(path)
+      end
+
+      it "should raise ContentLengthMismatch" do
+        lambda { resource.run_action(:create) }.should raise_error(Chef::Exceptions::ContentLengthMismatch)
+        #File.should_not exist(path) # XXX: CHEF-5081
+      end
+    end
+
+    context "when downloding truncated uncompressed data" do
+      let(:source) { 'http://localhost:9000/nyan_cat_truncated.png' }
+
+      before do
+        File.should_not exist(path)
+      end
+
+      it "should raise ContentLengthMismatch" do
+        lambda { resource.run_action(:create) }.should raise_error(Chef::Exceptions::ContentLengthMismatch)
+        #File.should_not exist(path) # XXX: CHEF-5081
+      end
+    end
+
+    context "when downloding data with transfer-encoding set" do
+      let(:expected_content) { binread(nyan_uncompressed_filename) }
+      let(:source) { 'http://localhost:9000/nyan_cat_transfer_encoding.png' }
+
+      before do
+        File.should_not exist(path)
+        resource.run_action(:create)
+      end
+
+      it "should create the file" do
+        File.should exist(path)
+      end
+
+      it "should mark the resource as updated" do
+        resource.should be_updated_by_last_action
+      end
+
+      it "has the correct content" do
+        binread(path).should == expected_content
+      end
+    end
+
+  end
 end

data/spec/functional/rest_spec.rb

@@ -0,0 +1,94 @@
+#
+# Author:: Lamont Granquist (<lamont@getchef.com>)
+# 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 'spec_helper'
+require 'tiny_server'
+require 'support/shared/functional/http'
+
+describe Chef::REST do
+  include ChefHTTPShared
+
+  let(:http_client) { described_class.new(source) }
+  let(:http_client_disable_gzip) { described_class.new(source, Chef::Config[:node_name], Chef::Config[:client_key], { :disable_gzip => true } ) }
+
+  shared_examples_for "downloads requests correctly" do
+    it "successfully downloads a streaming request" do
+      tempfile = http_client.streaming_request(source, {})
+      tempfile.close
+      expect(Digest::MD5.hexdigest(binread(tempfile.path))).to eq(Digest::MD5.hexdigest(expected_content))
+    end
+
+    it "successfully downloads a GET request" do
+      tempfile = http_client.get(source, {})
+      tempfile.close
+      expect(Digest::MD5.hexdigest(binread(tempfile.path))).to eq(Digest::MD5.hexdigest(expected_content))
+    end
+  end
+
+  shared_examples_for "validates content length and throws an exception" do
+    it "fails validation on a streaming download" do
+      expect { http_client.streaming_request(source, {}) }.to raise_error(Chef::Exceptions::ContentLengthMismatch)
+    end
+
+    it "fails validation on a GET request" do
+      expect { http_client.get(source, {}) }.to raise_error(Chef::Exceptions::ContentLengthMismatch)
+    end
+  end
+
+  shared_examples_for "an endpoint that 403s" do
+    it "fails with a Net::HTTPServerException on a streaming download" do
+      expect { http_client.streaming_request(source, {}) }.to raise_error(Net::HTTPServerException)
+    end
+
+    it "fails with a Net::HTTPServerException on a GET request" do
+      expect { http_client.get(source, {}) }.to raise_error(Net::HTTPServerException)
+    end
+  end
+
+  # see CHEF-5100
+  shared_examples_for "a 403 after a successful request when reusing the request object" do
+    it "fails with a Net::HTTPServerException on a streaming download" do
+      tempfile = http_client.streaming_request(source, {})
+      tempfile.close
+      expect(Digest::MD5.hexdigest(binread(tempfile.path))).to eq(Digest::MD5.hexdigest(expected_content))
+      expect { http_client.streaming_request(source2, {}) }.to raise_error(Net::HTTPServerException)
+    end
+
+    it "fails with a Net::HTTPServerException on a GET request" do
+      tempfile = http_client.get(source, {})
+      tempfile.close
+      expect(Digest::MD5.hexdigest(binread(tempfile.path))).to eq(Digest::MD5.hexdigest(expected_content))
+      expect { http_client.get(source2, {}) }.to raise_error(Net::HTTPServerException)
+    end
+  end
+
+  before do
+    Chef::Config[:node_name]  = "webmonkey.example.com"
+    Chef::Config[:client_key] = CHEF_SPEC_DATA + "/ssl/private_key.pem"
+  end
+
+  before(:all) do
+    start_tiny_server
+  end
+
+  after(:all) do
+    stop_tiny_server
+  end
+
+  it_behaves_like "downloading all the things"
+end

data/spec/functional/run_lock_spec.rb

@@ -276,6 +276,7 @@ E
       end
 
       wait_on_lock
+      sleep 0.5 # Possible race condition on Solaris which pid is observed as 0
       File.read(lockfile).should == p1.to_s
 
       Process.waitpid2(p1)
@@ -283,4 +284,3 @@ E
 
   end
 end
-

data/spec/functional/win32/service_manager_spec.rb

@@ -148,6 +148,12 @@ describe "Chef::Application::WindowsServiceManager", :windows_only, :system_wind
         service_manager.run(["-a", "install"])
       end
 
+      it "should have an own-process, non-interactive type" do
+        status = ::Win32::Service.status("spec-service")
+        status[:service_type].should == "own process"
+        status[:interactive].should be_false
+      end
+
       it "install => should say service already exists" do
           service_manager.run(["-a", "install"])
           @service_manager_output.grep(/already exists/).length.should > 0

data/spec/integration/knife/chef_fs_data_store_spec.rb

@@ -188,6 +188,7 @@ EOM
   when_the_repository 'is empty' do
     context 'POST /TYPE/NAME' do
       file 'empty.json', { 'name' => 'z' }
+      file 'empty_x.json', { 'name' => 'x' }
       file 'empty_id.json', { 'id' => 'z' }
       file 'rolestuff.json', '{"description":"hi there","name":"x"}'
       file 'cookbooks_to_upload/z/metadata.rb', "version '1.0.0'"
@@ -211,6 +212,7 @@ EOM
       end
 
       it 'knife raw -z -i empty.json -m POST /data/x' do
+        knife("raw -z -i #{path_to('empty_x.json')} -m POST /data").should_succeed /uri/
         knife("raw -z -i #{path_to('empty_id.json')} -m POST /data/x").should_succeed /"z"/
         knife('list --local -Rfp /data_bags').should_succeed "/data_bags/x/\n/data_bags/x/z.json\n"
       end

data/spec/integration/recipes/lwrp_inline_resources_spec.rb

@@ -0,0 +1,76 @@
+require 'support/shared/integration/integration_helper'
+require 'chef/mixin/shell_out'
+
+describe "LWRPs with inline resources" do
+  extend IntegrationSupport
+  include Chef::Mixin::ShellOut
+
+  let(:chef_dir) { File.join(File.dirname(__FILE__), "..", "..", "..", "bin") }
+
+  # Invoke `chef-client` as `ruby PATH/TO/chef-client`. This ensures the
+  # following constraints are satisfied:
+  # * Windows: windows can only run batch scripts as bare executables. Rubygems
+  # creates batch wrappers for installed gems, but we don't have batch wrappers
+  # in the source tree.
+  # * Other `chef-client` in PATH: A common case is running the tests on a
+  # machine that has omnibus chef installed. In that case we need to ensure
+  # we're running `chef-client` from the source tree and not the external one.
+  # cf. CHEF-4914
+  let(:chef_client) { "ruby #{chef_dir}/chef-client" }
+
+  when_the_repository "has a cookbook with a nested LWRP" do
+  	directory 'cookbooks/x' do
+
+      file 'resources/do_nothing.rb', <<EOM
+actions :create, :nothing
+default_action :create
+EOM
+      file 'providers/do_nothing.rb', <<EOM
+action :create do
+end
+EOM
+
+  	  file 'resources/my_machine.rb', <<EOM
+actions :create, :nothing
+default_action :create
+EOM
+      file 'providers/my_machine.rb', <<EOM
+use_inline_resources
+action :create do
+  x_do_nothing 'a'
+  x_do_nothing 'b'
+end
+EOM
+
+  	  file 'recipes/default.rb', <<EOM
+x_my_machine "me"
+x_my_machine "you"
+EOM
+
+  	end # directory 'cookbooks/x'
+
+    it "should complete with success" do
+      file 'config/client.rb', <<EOM
+local_mode true
+cookbook_path "#{path_to('cookbooks')}"
+log_level :warn
+EOM
+
+      result = shell_out("#{chef_client} -c \"#{path_to('config/client.rb')}\" --no-color -F doc -o 'x::default'", :cwd => chef_dir)
+      actual = result.stdout.lines.map { |l| l.chomp }.join("\n")
+      expected = <<EOM
+  * x_my_machine[me] action create
+    * x_do_nothing[a] action create (up to date)
+    * x_do_nothing[b] action create (up to date)
+     (up to date)
+  * x_my_machine[you] action create
+    * x_do_nothing[a] action create (up to date)
+    * x_do_nothing[b] action create (up to date)
+     (up to date)
+EOM
+      expected = expected.lines.map { |l| l.chomp }.join("\n")
+      actual.should include(expected)
+      result.error!
+    end
+  end
+end