diff options
author | sersut <serdar@opscode.com> | 2013-05-15 23:01:02 -0700 |
---|---|---|
committer | sersut <serdar@opscode.com> | 2013-05-15 23:01:02 -0700 |
commit | 3832d179e32c00d8f82d76a18ee93874647f8074 (patch) | |
tree | a95255ba40b528a974cba23ba4211765bff7f8dc | |
parent | 0bbecf0d06a7f0354b00d5bb71e0e7a9ed72de59 (diff) | |
download | chef-3832d179e32c00d8f82d76a18ee93874647f8074.tar.gz |
Deprecated methods for remote_file provider.
-rw-r--r-- | lib/chef/deprecation/provider/remote_file.rb | 86 | ||||
-rw-r--r-- | lib/chef/provider/remote_file.rb | 6 |
2 files changed, 92 insertions, 0 deletions
diff --git a/lib/chef/deprecation/provider/remote_file.rb b/lib/chef/deprecation/provider/remote_file.rb new file mode 100644 index 0000000000..2a528269d9 --- /dev/null +++ b/lib/chef/deprecation/provider/remote_file.rb @@ -0,0 +1,86 @@ +# +# Author:: Serdar Sutay (<serdar@opscode.com>) +# Copyright:: Copyright (c) 2013 Opscode, 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. +# + +# +# This module contains the deprecated functions of +# Chef::Provider::RemoteFile. These functions are refactored to different +# components. They are frozen and will be removed in Chef 12. +# + +class Chef + module Deprecation + module Provider + module RemoteFile + + def current_resource_matches_target_checksum? + @new_resource.checksum && @current_resource.checksum && @current_resource.checksum =~ /^#{Regexp.escape(@new_resource.checksum)}/ + end + + def matches_current_checksum?(candidate_file) + Chef::Log.debug "#{@new_resource} checking for file existence of #{@new_resource.path}" + if ::File.exists?(@new_resource.path) + Chef::Log.debug "#{@new_resource} file exists at #{@new_resource.path}" + @new_resource.checksum(checksum(candidate_file.path)) + Chef::Log.debug "#{@new_resource} target checksum: #{@current_resource.checksum}" + Chef::Log.debug "#{@new_resource} source checksum: #{@new_resource.checksum}" + + @new_resource.checksum == @current_resource.checksum + else + Chef::Log.debug "#{@new_resource} creating #{@new_resource.path}" + false + end + end + + def backup_new_resource + if ::File.exists?(@new_resource.path) + Chef::Log.debug "#{@new_resource} checksum changed from #{@current_resource.checksum} to #{@new_resource.checksum}" + backup @new_resource.path + end + end + + def source_file(source, current_checksum, &block) + if absolute_uri?(source) + fetch_from_uri(source, &block) + elsif !Chef::Config[:solo] + fetch_from_chef_server(source, current_checksum, &block) + else + fetch_from_local_cookbook(source, &block) + end + end + + def http_client_opts(source) + opts={} + # CHEF-3140 + # 1. If it's already compressed, trying to compress it more will + # probably be counter-productive. + # 2. Some servers are misconfigured so that you GET $URL/file.tgz but + # they respond with content type of tar and content encoding of gzip, + # which tricks Chef::REST into decompressing the response body. In this + # case you'd end up with a tar archive (no gzip) named, e.g., foo.tgz, + # which is not what you wanted. + if @new_resource.path =~ /gz$/ or source =~ /gz$/ + opts[:disable_gzip] = true + end + opts + end + + end + end + end +end + diff --git a/lib/chef/provider/remote_file.rb b/lib/chef/provider/remote_file.rb index e14d678743..3d4d2ee599 100644 --- a/lib/chef/provider/remote_file.rb +++ b/lib/chef/provider/remote_file.rb @@ -18,11 +18,17 @@ # require 'chef/provider/file' +require 'chef/deprecation/provider/remote_file' +require 'chef/deprecation/warnings' class Chef class Provider class RemoteFile < Chef::Provider::File + extend Chef::Deprecation::Warnings + include Chef::Deprecation::Provider::RemoteFile + add_deprecation_warnings_for(Chef::Deprecation::Provider::RemoteFile.instance_methods) + def initialize(new_resource, run_context) @content_class = Chef::Provider::RemoteFile::Content super |