chef 11.4.4 → 11.6.0.hotfix.1

data/spec/unit/provider/remote_file/local_file_spec.rb

@@ -0,0 +1,60 @@
+#
+# Author:: Jesse Campbell (<hikeit@gmail.com>)
+# Copyright:: Copyright (c) 2013 Jesse Campbell
+# 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'
+
+describe Chef::Provider::RemoteFile::LocalFile do
+
+  let(:uri) { URI.parse("file:///nyan_cat.png") }
+
+  let(:new_resource) { Chef::Resource::RemoteFile.new("local file backend test (new_resource)") }
+  let(:current_resource) { Chef::Resource::RemoteFile.new("local file backend test (current_resource)") }
+  subject(:fetcher) { Chef::Provider::RemoteFile::LocalFile.new(uri, new_resource, current_resource) }
+
+  context "when first created" do
+
+    it "stores the uri it is passed" do
+      fetcher.uri.should == uri
+    end
+
+    it "stores the new_resource" do
+      fetcher.new_resource.should == new_resource
+    end
+
+  end
+
+  describe "when fetching the object" do
+
+    let(:tempfile) { mock("Tempfile", :path => "/tmp/foo/bar/nyan.png") }
+    let(:chef_tempfile) { mock("Chef::FileContentManagement::Tempfile", :tempfile => tempfile) }
+
+    before do
+      current_resource.source("file:///nyan_cat.png")
+    end
+
+    it "stages the local file to a temporary file" do
+      Chef::FileContentManagement::Tempfile.should_receive(:new).with(new_resource).and_return(chef_tempfile)
+      ::FileUtils.should_receive(:cp).with(uri.path, tempfile.path)
+
+      result = fetcher.fetch
+      result.should == tempfile
+    end
+
+  end
+
+end

data/spec/unit/provider/remote_file_spec.rb

@@ -1,6 +1,7 @@
 #
 # Author:: Adam Jacob (<adam@opscode.com>)
-# Copyright:: Copyright (c) 2008 Opscode, Inc.
+# Author:: Lamont Granquist (<lamont@opscode.com>)
+# Copyright:: Copyright (c) 2008-2013 Opscode, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -18,307 +19,44 @@
 
 require 'spec_helper'
 
-describe Chef::Provider::RemoteFile, "action_create" do
-  before(:each) do
-    @resource = Chef::Resource::RemoteFile.new("seattle")
-    @resource.path(File.expand_path(File.join(CHEF_SPEC_DATA, "seattle.txt")))
-    @resource.source("http://foo")
-    @node = Chef::Node.new
-    @node.name "latte"
+require 'support/shared/unit/provider/file'
 
-    @events = Chef::EventDispatch::Dispatcher.new
-    @run_context = Chef::RunContext.new(@node, {}, @events)
 
-    @provider = Chef::Provider::RemoteFile.new(@resource, @run_context)
-    #To prevent the current_resource.checksum from being overridden.
-    @provider.stub!(:load_current_resource)
+describe Chef::Provider::RemoteFile do
+  let(:resource) do
+    resource = Chef::Resource::RemoteFile.new("seattle", @run_context)
+    resource.path(resource_path)
+    resource.source("http://foo")
+    resource.cookbook_name = "monkey"
+    resource
   end
 
-  describe "when checking if the file is at the target version" do
-    it "considers the current file to be at the target version if it exists and matches the user-provided checksum" do
-      @provider.current_resource = @resource.dup
-      @resource.checksum("0fd012fdc96e96f8f7cf2046522a54aed0ce470224513e45da6bc1a17a4924aa")
-      @provider.current_resource.checksum("0fd012fdc96e96f8f7cf2046522a54aed0ce470224513e45da6bc1a17a4924aa")
-      @provider.current_resource_matches_target_checksum?.should be_true
-    end
+  let(:content) do
+    content = mock('Chef::Provider::File::Content::RemoteFile')
   end
 
-  describe "when fetching the file from the remote" do
-    before(:each) do
-      @tempfile = Tempfile.new("chef-rspec-remote_file_spec-line#{__LINE__}--")
-
-      @rest = mock(Chef::REST, { })
-      Chef::REST.stub!(:new).and_return(@rest)
-      @rest.stub!(:streaming_request).and_return(@tempfile)
-      @rest.stub!(:create_url) { |url| url } 
-      @resource.cookbook_name = "monkey"
-
-      @provider.stub!(:checksum).and_return("0fd012fdc96e96f8f7cf2046522a54aed0ce470224513e45da6bc1a17a4924aa")
-      @provider.current_resource = @resource.clone
-      @provider.current_resource.checksum("0fd012fdc96e96f8f7cf2046522a54aed0ce470224513e45da6bc1a17a4924aa")
-      File.stub!(:exists?).and_return(true)
-      FileUtils.stub!(:cp).and_return(true)
-      Chef::Platform.stub!(:find_platform_and_version).and_return([ :mac_os_x, "10.5.1" ])
-    end
-
-    after do
-      @tempfile.close!
-    end
-
-    before do
-      @resource.source("http://opscode.com/seattle.txt")
-    end
-
-    describe "and the target location's enclosing directory does not exist" do
-      before do
-        @resource.path("/tmp/this/path/does/not/exist/file.txt")
-      end
-
-      it "raises a specific error describing the problem" do
-        lambda {@provider.run_action(:create)}.should raise_error(Chef::Exceptions::EnclosingDirectoryDoesNotExist)
-      end
-    end
-
-    shared_examples_for "source specified with multiple URIs" do
-      it "should try to download the next URI when the first one fails" do
-        @rest.should_receive(:streaming_request).with("http://foo", {}).once.and_raise(SocketError)
-        @rest.should_receive(:streaming_request).with("http://bar", {}).once.and_return(@tempfile)
-        @provider.run_action(:create)
-      end
-
-      it "should raise an exception when all the URIs fail" do
-        @rest.should_receive(:streaming_request).with("http://foo", {}).once.and_raise(SocketError)
-        @rest.should_receive(:streaming_request).with("http://bar", {}).once.and_raise(SocketError)
-        lambda { @provider.run_action(:create) }.should raise_error(SocketError)
-      end
-
-      it "should download from only one URI when the first one works" do
-        @rest.should_receive(:streaming_request).once.and_return(@tempfile)
-        @provider.run_action(:create)
-      end
-
-    end
-
-    describe "and the source specifies multiple URIs using multiple arguments" do
-      it_should_behave_like "source specified with multiple URIs"
-
-      before(:each) do
-        @resource.source("http://foo", "http://bar")
-      end
-    end
-
-    describe "and the source specifies multiple URIs using an array" do
-      it_should_behave_like "source specified with multiple URIs"
-
-      before(:each) do
-        @resource.source([ "http://foo", "http://bar" ])
-      end
-    end
-
-    describe "and the resource specifies a checksum" do
-
-      describe "and the existing file matches the checksum exactly" do
-        before do
-          @resource.checksum("0fd012fdc96e96f8f7cf2046522a54aed0ce470224513e45da6bc1a17a4924aa")
-        end
-
-        it "does not download the file" do
-          @rest.should_not_receive(:fetch).with("http://opscode.com/seattle.txt").and_return(@tempfile)
-          @provider.run_action(:create)
-        end
-
-        it "does not update the resource" do
-          @provider.run_action(:create)
-          @provider.new_resource.should_not be_updated
-        end
-
-      end
-
-      describe "and the existing file matches the given partial checksum" do
-        before do
-          @resource.checksum("0fd012fd")
-        end
-
-        it "should not download the file if the checksum is a partial match from the beginning" do
-          @rest.should_not_receive(:fetch).with("http://opscode.com/seattle.txt").and_return(@tempfile)
-          @provider.run_action(:create)
-        end
-
-        it "does not update the resource" do
-          @provider.run_action(:create)
-          @provider.new_resource.should_not be_updated
-        end
-
-      end
-
-      describe "and the existing file doesn't match the given checksum" do
-        it "downloads the file" do
-          @resource.checksum("this hash doesn't match")
-          @rest.should_receive(:streaming_request).with("http://opscode.com/seattle.txt", {}).and_return(@tempfile)
-          @provider.stub!(:update_new_file_state)
-          @provider.run_action(:create)
-        end
-
-        it "does not consider the checksum a match if the matching string is offset" do
-          # i.e., the existing file is      "0fd012fdc96e96f8f7cf2046522a54aed0ce470224513e45da6bc1a17a4924aa"
-          @resource.checksum("fd012fd")
-          @rest.should_receive(:streaming_request).with("http://opscode.com/seattle.txt", {}).and_return(@tempfile)
-          @provider.stub!(:update_new_file_state)
-          @provider.run_action(:create)
-        end
-      end
-
-    end
-
-    describe "and the resource doesn't specify a checksum" do
-      it "should download the file from the remote URL" do
-        @resource.checksum(nil)
-        @rest.should_receive(:streaming_request).with("http://opscode.com/seattle.txt", {}).and_return(@tempfile)
-        @provider.run_action(:create)
-      end
-    end
-
-    # CHEF-3140
-    # Some servers return tarballs as content type tar and encoding gzip, which
-    # is totally wrong. When this happens and gzip isn't disabled, Chef::REST
-    # will decompress the file for you, which is not at all what you expected
-    # to happen (you end up with an uncomressed tar archive instead of the
-    # gzipped tar archive you expected). To work around this behavior, we
-    # detect when users are fetching gzipped files and turn off gzip in
-    # Chef::REST.
-
-    context "and the target file is a tarball" do
-      before do
-        @resource.path(File.expand_path(File.join(CHEF_SPEC_DATA, "seattle.tar.gz")))
-        Chef::REST.should_receive(:new).with("http://opscode.com/seattle.txt", nil, nil, :disable_gzip => true).and_return(@rest)
-      end
-
-      it "disables gzip in the http client" do
-        @provider.action_create
-      end
-
-    end
-
-    context "and the source appears to be a tarball" do
-      before do
-        @resource.source("http://example.com/tarball.tgz")
-        Chef::REST.should_receive(:new).with("http://example.com/tarball.tgz", nil, nil, :disable_gzip => true).and_return(@rest)
-      end
-
-      it "disables gzip in the http client" do
-        @provider.action_create
-      end
-    end
-
-    it "should raise an exception if it's any other kind of retriable response than 304" do
-      r = Net::HTTPMovedPermanently.new("one", "two", "three")
-      e = Net::HTTPRetriableError.new("301", r)
-      @rest.stub!(:streaming_request).and_raise(e)
-      lambda { @provider.run_action(:create) }.should raise_error(Net::HTTPRetriableError)
-    end
-
-    it "should raise an exception if anything else happens" do
-      r = Net::HTTPBadRequest.new("one", "two", "three")
-      e = Net::HTTPServerException.new("fake exception", r)
-      @rest.stub!(:streaming_request).and_raise(e)
-      lambda { @provider.run_action(:create) }.should raise_error(Net::HTTPServerException)
-    end
-
-    it "should checksum the raw file" do
-      @provider.should_receive(:checksum).with(@tempfile.path).and_return("0fd012fdc96e96f8f7cf2046522a54aed0ce470224513e45da6bc1a17a4924aa")
-      @provider.run_action(:create)
-    end
-
-    describe "when the target file does not exist" do
-      before do
-        ::File.stub!(:exists?).with(@resource.path).and_return(false)
-        @provider.stub!(:get_from_server).and_return(@tempfile)
-      end
-
-      it "should copy the raw file to the new resource" do
-        FileUtils.should_receive(:cp).with(@tempfile.path, @resource.path).and_return(true)
-        @provider.stub!(:update_new_file_state)
-        @provider.run_action(:create)
-      end
-
-      it "should set the new resource to updated" do
-        @provider.stub!(:update_new_file_state)
-        @provider.run_action(:create)
-        @resource.should be_updated
-      end
-
-      describe "and create_if_missing is invoked" do
-        it "should invoke action_create" do
-          @provider.should_receive(:action_create)
-          @provider.run_action(:create_if_missing)
-        end
-      end
-    end
-
-    describe "when the target file already exists" do
-      before do
-        ::File.stub!(:exists?).with(@resource.path).and_return(true)
-        @provider.stub!(:diff_current).and_return([
-         "--- /tmp/foo  2012-08-30 21:28:17.632782551 +0000",
-         "+++ /tmp/bar 2012-08-30 21:28:20.816975437 +0000",
-         "@@ -1 +1 @@",
-         "-foo bar",
-         "+bar foo"
-        ])
-        @provider.stub!(:get_from_server).and_return(@tempfile)
-      end
-
-      describe "and create_if_missing is invoked" do
-        it "should take no action" do
-          @provider.should_not_receive(:action_create) 
-          @provider.run_action(:create_if_missing)
-        end
-      end
-
-      describe "and the file downloaded from the remote is identical to the current" do
-        it "shouldn't backup the original file" do
-          @provider.should_not_receive(:backup).with(@resource.path)
-          @provider.run_action(:create)
-        end
-
-        it "doesn't mark the resource as updated" do
-          @provider.run_action(:create)
-          @provider.new_resource.should_not be_updated
-        end
-      end
-
-      describe "and the checksum doesn't match" do
-        before do
-          sha2_256 = "0fd012fdc96e96f8f7cf2046522a54aed0ce470224513e45da6bc1a17a4924aa-NO_MATCHY"
-          @provider.current_resource.checksum(sha2_256)
-        end
-
-        it "should backup the original file" do
-          @provider.stub!(:update_new_file_state)
-          @provider.should_receive(:backup).with(@resource.path).and_return(true)
-          @provider.run_action(:create)
-        end
-
-        it "should copy the raw file to the new resource" do
-          @provider.stub!(:update_new_file_state)
-          FileUtils.should_receive(:cp).with(@tempfile.path, @resource.path).and_return(true)
-          @provider.run_action(:create)
-        end
-
-        it "should set the new resource to updated" do
-          @provider.stub!(:update_new_file_state)
-          @provider.run_action(:create)
-          @resource.should be_updated
-        end
-      end
-
-      it "should set permissions" do
-        @provider.should_receive(:set_all_access_controls).and_return(true)
-        @provider.run_action(:create)
-      end
+  let(:node) { double('Chef::Node') }
+  let(:events) { double('Chef::Events').as_null_object }  # mock all the methods
+  let(:run_context) { double('Chef::RunContext', :node => node, :events => events) }
+  let(:enclosing_directory) {
+    canonicalize_path(File.expand_path(File.join(CHEF_SPEC_DATA, "templates")))
+  }
+  let(:resource_path) {
+    canonicalize_path(File.expand_path(File.join(enclosing_directory, "seattle.txt")))
+  }
+
+  subject(:provider) do
+    provider = described_class.new(resource, run_context)
+    provider.stub!(:content).and_return(content)
+    provider.stub!(:update_new_resource_checksum).and_return(nil) # Otherwise it doesn't behave like a File provider
+    provider
+  end
 
+  before do
+    Chef::FileCache.stub!(:load).with("remote_file/#{resource.name}").and_raise(Chef::Exceptions::FileNotFound)
+  end
 
-    end
+  it_behaves_like Chef::Provider::File
 
-  end
 end
+

data/spec/unit/provider/route_spec.rb

@@ -108,6 +108,21 @@ describe Chef::Provider::Route do
       @provider.run_action(:add)
       @new_resource.should_not be_updated
     end
+
+    it "should not delete config file for :add action (CHEF-3332)" do
+      @node.automatic_attrs[:platform] = 'centos'
+  
+      route_file = StringIO.new
+      File.should_receive(:new).and_return(route_file)
+      @resource_add = Chef::Resource::Route.new('192.168.1.0/24 via 192.168.0.1')
+      @run_context.resource_collection << @resource_add
+      @provider.stub!(:run_command).and_return(true)
+  
+      @resource_add.action(:add)
+      @provider.run_action(:add)
+      route_file.string.split("\n").should have(1).items
+      route_file.string.should match(/^192\.168\.1\.0\/24 via 192\.168\.0\.1$/)
+    end
   end
 
   describe Chef::Provider::Route, "action_delete" do
@@ -140,12 +155,12 @@ describe Chef::Provider::Route do
     end
 
     it "should include ' via $gateway ' when a gateway is specified" do
-      @provider.generate_command(:add).should match(/\svia\s#{@new_resource.gateway}\s/)
+      @provider.generate_command(:add).should match(/\svia\s#{Regexp.escape(@new_resource.gateway.to_s)}\s/)
     end
 
     it "should not include ' via $gateway ' when a gateway is not specified" do
       @new_resource.stub!(:gateway).and_return(nil)
-      @provider.generate_command(:add).should_not match(/\svia\s#{@new_resource.gateway}\s/)
+      @provider.generate_command(:add).should_not match(/\svia\s#{Regexp.escape(@new_resource.gateway.to_s)}\s/)
     end
   end
 
@@ -161,12 +176,12 @@ describe Chef::Provider::Route do
     end
 
     it "should include ' via $gateway ' when a gateway is specified" do
-      @provider.generate_command(:delete).should match(/\svia\s#{@new_resource.gateway}\s/)
+      @provider.generate_command(:delete).should match(/\svia\s#{Regexp.escape(@new_resource.gateway.to_s)}\s/)
     end
 
     it "should not include ' via $gateway ' when a gateway is not specified" do
       @new_resource.stub!(:gateway).and_return(nil)
-      @provider.generate_command(:delete).should_not match(/\svia\s#{@new_resource.gateway}\s/)
+      @provider.generate_command(:delete).should_not match(/\svia\s#{Regexp.escape(@new_resource.gateway.to_s)}\s/)
     end
   end
 
@@ -181,11 +196,11 @@ describe Chef::Provider::Route do
     end
 
     it "should include ' via $gateway ' when a gateway is specified" do
-      @provider.config_file_contents(:add, { :target => @new_resource.target, :gateway => @new_resource.gateway}).should match(/\svia\s#{@new_resource.gateway}\n/)
+      @provider.config_file_contents(:add, { :target => @new_resource.target, :gateway => @new_resource.gateway}).should match(/\svia\s#{Regexp.escape(@new_resource.gateway.to_s)}\n/)
     end
 
     it "should not include ' via $gateway ' when a gateway is not specified" do
-      @provider.generate_command(:add).should_not match(/\svia\s#{@new_resource.gateway}\n/)
+      @provider.generate_command(:add).should_not match(/\svia\s#{Regexp.escape(@new_resource.gateway.to_s)}\n/)
     end
   end
 
@@ -217,11 +232,12 @@ describe Chef::Provider::Route do
       @run_context.resource_collection << Chef::Resource::Route.new('192.168.2.0/24 via 192.168.0.1')
       @run_context.resource_collection << Chef::Resource::Route.new('192.168.3.0/24 via 192.168.0.1')
 
+      @provider.action = :add
       @provider.generate_config
       route_file.string.split("\n").should have(3).items
-      route_file.string.should match(/^192.168.1.0\/24 via 192.168.0.1$/)
-      route_file.string.should match(/^192.168.2.0\/24 via 192.168.0.1$/)
-      route_file.string.should match(/^192.168.3.0\/24 via 192.168.0.1$/)
+      route_file.string.should match(/^192\.168\.1\.0\/24 via 192\.168\.0\.1$/)
+      route_file.string.should match(/^192\.168\.2\.0\/24 via 192\.168\.0\.1$/)
+      route_file.string.should match(/^192\.168\.3\.0\/24 via 192\.168\.0\.1$/)
     end
   end
 end