chef 12.6.0 → 12.7.2

data/lib/chef/provider/remote_file/content.rb

@@ -1,7 +1,7 @@
 #
 # Author:: Jesse Campbell (<hikeit@gmail.com>)
-# Author:: Lamont Granquist (<lamont@opscode.com>)
-# Copyright:: Copyright (c) 2013 Opscode, Inc.
+# Author:: Lamont Granquist (<lamont@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");
@@ -17,10 +17,10 @@
 # limitations under the License.
 #
 
-require 'uri'
-require 'tempfile'
-require 'chef/file_content_management/content_base'
-require 'chef/mixin/uris'
+require "uri"
+require "tempfile"
+require "chef/file_content_management/content_base"
+require "chef/mixin/uris"
 
 class Chef
   class Provider
@@ -49,13 +49,13 @@ class Chef
           source = sources.shift
           begin
             uri = if Chef::Provider::RemoteFile::Fetcher.network_share?(source)
-              source
-            else
-              as_uri(source)
-            end
+                    source
+                  else
+                    as_uri(source)
+                  end
             raw_file = grab_file_from_uri(uri)
           rescue SocketError, Errno::ECONNREFUSED, Errno::ENOENT, Errno::EACCES, Timeout::Error, Net::HTTPServerException, Net::HTTPFatalError, Net::FTPError => e
-            Chef::Log.warn("#{@new_resource} cannot be downloaded from #{source}: #{e.to_s}")
+            Chef::Log.warn("#{@new_resource} cannot be downloaded from #{source}: #{e}")
             if source = sources.shift
               Chef::Log.info("#{@new_resource} trying to download from another mirror")
               retry

data/lib/chef/provider/remote_file/fetcher.rb

@@ -1,7 +1,7 @@
 #
 # Author:: Jesse Campbell (<hikeit@gmail.com>)
-# Author:: Lamont Granquist (<lamont@opscode.com>)
-# Copyright:: Copyright (c) 2013 Opscode, Inc.
+# Author:: Lamont Granquist (<lamont@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");

data/lib/chef/provider/remote_file/ftp.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Jesse Campbell (<hikeit@gmail.com>)
-# Copyright:: Copyright (c) 2013 Jesse Campbell
+# Copyright:: Copyright 2013-2016, Jesse Campbell
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,11 +16,11 @@
 # limitations under the License.
 #
 
-require 'uri'
-require 'tempfile'
-require 'net/ftp'
-require 'chef/provider/remote_file'
-require 'chef/file_content_management/tempfile'
+require "uri"
+require "tempfile"
+require "net/ftp"
+require "chef/provider/remote_file"
+require "chef/file_content_management/tempfile"
 
 class Chef
   class Provider
@@ -59,7 +59,7 @@ class Chef
           if uri.userinfo
             URI.unescape(uri.user)
           else
-            'anonymous'
+            "anonymous"
           end
         end
 
@@ -94,11 +94,11 @@ class Chef
         private
 
         def with_proxy_env
-          saved_socks_env = ENV['SOCKS_SERVER']
-          ENV['SOCKS_SERVER'] = proxy_uri(@uri).to_s
+          saved_socks_env = ENV["SOCKS_SERVER"]
+          ENV["SOCKS_SERVER"] = proxy_uri(@uri).to_s
           yield
         ensure
-          ENV['SOCKS_SERVER'] = saved_socks_env
+          ENV["SOCKS_SERVER"] = saved_socks_env
         end
 
         def with_connection
@@ -162,7 +162,7 @@ class Chef
         end
 
         def parse_path
-          path = uri.path.sub(%r{\A/}, '%2F') # re-encode the beginning slash because uri library decodes it.
+          path = uri.path.sub(%r{\A/}, "%2F") # re-encode the beginning slash because uri library decodes it.
           directories = path.split(%r{/}, -1)
           directories.each {|d|
             d.gsub!(/%([0-9A-Fa-f][0-9A-Fa-f])/) { [$1].pack("H2") }

data/lib/chef/provider/remote_file/http.rb

@@ -1,7 +1,7 @@
 #
 # Author:: Jesse Campbell (<hikeit@gmail.com>)
-# Author:: Lamont Granquist (<lamont@opscode.com>)
-# Copyright:: Copyright (c) 2013 Jesse Campbell
+# Author:: Lamont Granquist (<lamont@chef.io>)
+# Copyright:: Copyright 2013-2016, Jesse Campbell
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -17,10 +17,10 @@
 # limitations under the License.
 #
 
-require 'chef/http/simple'
-require 'chef/digester'
-require 'chef/provider/remote_file'
-require 'chef/provider/remote_file/cache_control_data'
+require "chef/http/simple"
+require "chef/digester"
+require "chef/provider/remote_file"
+require "chef/provider/remote_file/cache_control_data"
 
 class Chef
   class Provider
@@ -87,15 +87,15 @@ class Chef
         end
 
         def last_modified_time_from(response)
-          response['last_modified'] || response['date']
+          response["last_modified"] || response["date"]
         end
 
         def etag_from(response)
-          response['etag']
+          response["etag"]
         end
 
         def http_client_opts
-          opts={}
+          opts = {}
           # CHEF-3140
           # 1. If it's already compressed, trying to compress it more will
           # probably be counter-productive.

data/lib/chef/provider/remote_file/local_file.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Jesse Campbell (<hikeit@gmail.com>)
-# Copyright:: Copyright (c) 2013 Jesse Campbell
+# Copyright:: Copyright 2013-2016, Jesse Campbell
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,9 +16,9 @@
 # limitations under the License.
 #
 
-require 'uri'
-require 'tempfile'
-require 'chef/provider/remote_file'
+require "uri"
+require "tempfile"
+require "chef/provider/remote_file"
 
 class Chef
   class Provider
@@ -35,7 +35,7 @@ class Chef
 
         # CHEF-4472: Remove the leading slash from windows paths that we receive from a file:// URI
         def fix_windows_path(path)
-          path.gsub(/^\/([a-zA-Z]:)/,'\1')
+          path.gsub(/^\/([a-zA-Z]:)/, '\1')
         end
 
         def source_path

data/lib/chef/provider/remote_file/network_file.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Jesse Campbell (<hikeit@gmail.com>)
-# Copyright:: Copyright (c) 2013 Jesse Campbell
+# Copyright:: Copyright 2013-2016, Jesse Campbell
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,9 +16,9 @@
 # limitations under the License.
 #
 
-require 'uri'
-require 'tempfile'
-require 'chef/provider/remote_file'
+require "uri"
+require "tempfile"
+require "chef/provider/remote_file"
 
 class Chef
   class Provider

data/lib/chef/provider/route.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Bryan McLellan (btm@loftninjas.org), Jesse Nelson (spheromak@gmail.com)
-# Copyright:: Copyright (c) 2009 Bryan McLellan
+# Copyright:: Copyright 2009-2016, Bryan McLellan
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,214 +16,214 @@
 # limitations under the License.
 #
 
-require 'chef/log'
-require 'chef/mixin/command'
-require 'chef/provider'
-require 'ipaddr'
+require "chef/log"
+require "chef/mixin/command"
+require "chef/provider"
+require "ipaddr"
 
 class Chef::Provider::Route < Chef::Provider
-    include Chef::Mixin::Command
-
-    provides :route
-
-    attr_accessor :is_running
-
-    MASK = {'0.0.0.0'          => '0',
-            '128.0.0.0'        => '1',
-            '192.0.0.0'        => '2',
-            '224.0.0.0'        => '3',
-            '240.0.0.0'        => '4',
-            '248.0.0.0'        => '5',
-            '252.0.0.0'        => '6',
-            '254.0.0.0'        => '7',
-            '255.0.0.0'        => '8',
-            '255.128.0.0'      => '9',
-            '255.192.0.0'      => '10',
-            '255.224.0.0'      => '11',
-            '255.240.0.0'      => '12',
-            '255.248.0.0'      => '13',
-            '255.252.0.0'      => '14',
-            '255.254.0.0'      => '15',
-            '255.255.0.0'      => '16',
-            '255.255.128.0'    => '17',
-            '255.255.192.0'    => '18',
-            '255.255.224.0'    => '19',
-            '255.255.240.0'    => '20',
-            '255.255.248.0'    => '21',
-            '255.255.252.0'    => '22',
-            '255.255.254.0'    => '23',
-            '255.255.255.0'    => '24',
-            '255.255.255.128'  => '25',
-            '255.255.255.192'  => '26',
-            '255.255.255.224'  => '27',
-            '255.255.255.240'  => '28',
-            '255.255.255.248'  => '29',
-            '255.255.255.252'  => '30',
-            '255.255.255.254'  => '31',
-            '255.255.255.255'  => '32' }
-
-    def hex2ip(hex_data)
-      # Cleanup hex data
-      hex_ip = hex_data.to_s.downcase.gsub(/[^0-9a-f]/, '')
-
-      # Check hex data format (IP is a 32bit integer, so should be 8 chars long)
-      return nil if hex_ip.length != hex_data.length || hex_ip.length != 8
-
-      # Extract octets from hex data
-      octets = hex_ip.scan(/../).reverse.collect { |octet| [octet].pack('H2').unpack("C").first }
-
-      # Validate IP
-      ip = octets.join('.')
-      begin
-        IPAddr.new(ip, Socket::AF_INET).to_s
-      rescue ArgumentError
-        Chef::Log.debug("Invalid IP address data: hex=#{hex_ip}, ip=#{ip}")
-        return nil
-      end
-    end
-
-    def whyrun_supported?
-      true
+  include Chef::Mixin::Command
+
+  provides :route
+
+  attr_accessor :is_running
+
+  MASK = { "0.0.0.0"          => "0",
+           "128.0.0.0"        => "1",
+           "192.0.0.0"        => "2",
+           "224.0.0.0"        => "3",
+           "240.0.0.0"        => "4",
+           "248.0.0.0"        => "5",
+           "252.0.0.0"        => "6",
+           "254.0.0.0"        => "7",
+           "255.0.0.0"        => "8",
+           "255.128.0.0"      => "9",
+           "255.192.0.0"      => "10",
+           "255.224.0.0"      => "11",
+           "255.240.0.0"      => "12",
+           "255.248.0.0"      => "13",
+           "255.252.0.0"      => "14",
+           "255.254.0.0"      => "15",
+           "255.255.0.0"      => "16",
+           "255.255.128.0"    => "17",
+           "255.255.192.0"    => "18",
+           "255.255.224.0"    => "19",
+           "255.255.240.0"    => "20",
+           "255.255.248.0"    => "21",
+           "255.255.252.0"    => "22",
+           "255.255.254.0"    => "23",
+           "255.255.255.0"    => "24",
+           "255.255.255.128"  => "25",
+           "255.255.255.192"  => "26",
+           "255.255.255.224"  => "27",
+           "255.255.255.240"  => "28",
+           "255.255.255.248"  => "29",
+           "255.255.255.252"  => "30",
+           "255.255.255.254"  => "31",
+           "255.255.255.255"  => "32" }
+
+  def hex2ip(hex_data)
+    # Cleanup hex data
+    hex_ip = hex_data.to_s.downcase.gsub(/[^0-9a-f]/, "")
+
+    # Check hex data format (IP is a 32bit integer, so should be 8 chars long)
+    return nil if hex_ip.length != hex_data.length || hex_ip.length != 8
+
+    # Extract octets from hex data
+    octets = hex_ip.scan(/../).reverse.collect { |octet| [octet].pack("H2").unpack("C").first }
+
+    # Validate IP
+    ip = octets.join(".")
+    begin
+      IPAddr.new(ip, Socket::AF_INET).to_s
+    rescue ArgumentError
+      Chef::Log.debug("Invalid IP address data: hex=#{hex_ip}, ip=#{ip}")
+      return nil
     end
+  end
 
-    def load_current_resource
-      self.is_running = false
+  def whyrun_supported?
+    true
+  end
 
-      # cidr or quad dot mask
-      if @new_resource.netmask
-        new_ip = IPAddr.new("#{@new_resource.target}/#{@new_resource.netmask}")
-      else
-        new_ip = IPAddr.new(@new_resource.target)
-      end
-
-      # For linux, we use /proc/net/route file to read proc table info
-      if node[:os] == "linux"
-        route_file = ::File.open("/proc/net/route", "r")
-
-        # Read all routes
-        while (line = route_file.gets)
-          # Get all the fields for a route
-          iface,destination,gateway,flags,refcnt,use,metric,mask,mtu,window,irtt = line.split
-
-          # Convert hex-encoded values to quad-dotted notation (e.g. 0064A8C0 => 192.168.100.0)
-          destination = hex2ip(destination)
-          gateway = hex2ip(gateway)
-          mask = hex2ip(mask)
-
-          # Skip formatting lines (header, etc)
-          next unless destination && gateway && mask
-          Chef::Log.debug("#{@new_resource} system has route: dest=#{destination} mask=#{mask} gw=#{gateway}")
-
-          # check if what were trying to configure is already there
-          # use an ipaddr object with ip/mask this way we can have
-          # a new resource be in cidr format (i don't feel like
-          # expanding bitmask by hand.
-          #
-          running_ip = IPAddr.new("#{destination}/#{mask}")
-          Chef::Log.debug("#{@new_resource} new ip: #{new_ip.inspect} running ip: #{running_ip.inspect}")
-          self.is_running = true if running_ip == new_ip && gateway == @new_resource.gateway
-        end
+  def load_current_resource
+    self.is_running = false
 
-        route_file.close
-      end
+    # cidr or quad dot mask
+    if @new_resource.netmask
+      new_ip = IPAddr.new("#{@new_resource.target}/#{@new_resource.netmask}")
+    else
+      new_ip = IPAddr.new(@new_resource.target)
     end
 
-    def action_add
-      # check to see if load_current_resource found the route
-      if is_running
-        Chef::Log.debug("#{@new_resource} route already active - nothing to do")
-      else
-        command = generate_command(:add)
-        converge_by ("run #{ command } to add route") do
-          run_command( :command => command )
-          Chef::Log.info("#{@new_resource} added")
-        end
+    # For linux, we use /proc/net/route file to read proc table info
+    if node[:os] == "linux"
+      route_file = ::File.open("/proc/net/route", "r")
+
+      # Read all routes
+      while (line = route_file.gets)
+        # Get all the fields for a route
+        iface, destination, gateway, flags, refcnt, use, metric, mask, mtu, window, irtt = line.split
+
+        # Convert hex-encoded values to quad-dotted notation (e.g. 0064A8C0 => 192.168.100.0)
+        destination = hex2ip(destination)
+        gateway = hex2ip(gateway)
+        mask = hex2ip(mask)
+
+        # Skip formatting lines (header, etc)
+        next unless destination && gateway && mask
+        Chef::Log.debug("#{@new_resource} system has route: dest=#{destination} mask=#{mask} gw=#{gateway}")
+
+        # check if what were trying to configure is already there
+        # use an ipaddr object with ip/mask this way we can have
+        # a new resource be in cidr format (i don't feel like
+        # expanding bitmask by hand.
+        #
+        running_ip = IPAddr.new("#{destination}/#{mask}")
+        Chef::Log.debug("#{@new_resource} new ip: #{new_ip.inspect} running ip: #{running_ip.inspect}")
+        self.is_running = true if running_ip == new_ip && gateway == @new_resource.gateway
       end
 
-      #for now we always write the file (ugly but its what it is)
-      generate_config
+      route_file.close
     end
-
-    def action_delete
-      if is_running
-        command = generate_command(:delete)
-        converge_by ("run #{ command } to delete route ") do
-          run_command( :command => command )
-          Chef::Log.info("#{@new_resource} removed")
-        end
-      else
-        Chef::Log.debug("#{@new_resource} route does not exist - nothing to do")
+  end
+
+  def action_add
+    # check to see if load_current_resource found the route
+    if is_running
+      Chef::Log.debug("#{@new_resource} route already active - nothing to do")
+    else
+      command = generate_command(:add)
+      converge_by ("run #{ command } to add route") do
+        run_command( :command => command )
+        Chef::Log.info("#{@new_resource} added")
       end
+    end
+
+    #for now we always write the file (ugly but its what it is)
+    generate_config
+  end
 
-      #for now we always write the file (ugly but its what it is)
-      generate_config
+  def action_delete
+    if is_running
+      command = generate_command(:delete)
+      converge_by ("run #{ command } to delete route ") do
+        run_command( :command => command )
+        Chef::Log.info("#{@new_resource} removed")
+      end
+    else
+      Chef::Log.debug("#{@new_resource} route does not exist - nothing to do")
     end
 
-    def generate_config
-      conf = Hash.new
-      case node[:platform]
-      when "centos", "redhat", "fedora"
-        # walk the collection
-        run_context.resource_collection.each do |resource|
-          if resource.is_a? Chef::Resource::Route
-            # default to eth0
-            if resource.device
-              dev = resource.device
-            else
-              dev = "eth0"
-            end
-
-            conf[dev] = String.new if conf[dev].nil?
-            case @action
-            when :add
-              conf[dev] << config_file_contents(:add, :target => resource.target, :netmask => resource.netmask, :gateway => resource.gateway)
-            when :delete
-              # need to do this for the case when the last route on an int
-              # is removed
-              conf[dev] << config_file_contents(:delete)
-            end
+    #for now we always write the file (ugly but its what it is)
+    generate_config
+  end
+
+  def generate_config
+    conf = Hash.new
+    case node[:platform]
+    when "centos", "redhat", "fedora"
+      # walk the collection
+      run_context.resource_collection.each do |resource|
+        if resource.is_a? Chef::Resource::Route
+          # default to eth0
+          if resource.device
+            dev = resource.device
+          else
+            dev = "eth0"
           end
-        end
-        conf.each do |k, v|
-          network_file_name = "/etc/sysconfig/network-scripts/route-#{k}"
-          converge_by ("write route route.#{k}\n#{conf[k]} to #{ network_file_name }") do
-            network_file = ::File.new(network_file_name, "w")
-            network_file.puts(conf[k])
-            Chef::Log.debug("#{@new_resource} writing route.#{k}\n#{conf[k]}")
-            network_file.close
+
+          conf[dev] = String.new if conf[dev].nil?
+          case @action
+          when :add
+            conf[dev] << config_file_contents(:add, :target => resource.target, :netmask => resource.netmask, :gateway => resource.gateway)
+          when :delete
+            # need to do this for the case when the last route on an int
+            # is removed
+            conf[dev] << config_file_contents(:delete)
           end
         end
       end
-    end
-
-    def generate_command(action)
-      common_route_items = ''
-      common_route_items << "/#{MASK[@new_resource.netmask.to_s]}" if @new_resource.netmask
-      common_route_items << " via #{@new_resource.gateway} " if @new_resource.gateway
-
-      case action
-      when :add
-        command = "ip route replace #{@new_resource.target}"
-        command << common_route_items
-        command << " dev #{@new_resource.device} " if @new_resource.device
-      when :delete
-        command = "ip route delete #{@new_resource.target}"
-        command << common_route_items
+      conf.each do |k, v|
+        network_file_name = "/etc/sysconfig/network-scripts/route-#{k}"
+        converge_by ("write route route.#{k}\n#{conf[k]} to #{ network_file_name }") do
+          network_file = ::File.new(network_file_name, "w")
+          network_file.puts(conf[k])
+          Chef::Log.debug("#{@new_resource} writing route.#{k}\n#{conf[k]}")
+          network_file.close
+        end
       end
-
-      return command
+    end
+  end
+
+  def generate_command(action)
+    common_route_items = ""
+    common_route_items << "/#{MASK[@new_resource.netmask.to_s]}" if @new_resource.netmask
+    common_route_items << " via #{@new_resource.gateway} " if @new_resource.gateway
+
+    case action
+    when :add
+      command = "ip route replace #{@new_resource.target}"
+      command << common_route_items
+      command << " dev #{@new_resource.device} " if @new_resource.device
+    when :delete
+      command = "ip route delete #{@new_resource.target}"
+      command << common_route_items
     end
 
-    def config_file_contents(action, options={})
-      content = ''
-      case action
-      when :add
-        content << "#{options[:target]}"
-        content << "/#{options[:netmask]}" if options[:netmask]
-        content << " via #{options[:gateway]}" if options[:gateway]
-        content << "\n"
-      end
-
-      return content
+    return command
+  end
+
+  def config_file_contents(action, options = {})
+    content = ""
+    case action
+    when :add
+      content << "#{options[:target]}"
+      content << "/#{options[:netmask]}" if options[:netmask]
+      content << " via #{options[:gateway]}" if options[:gateway]
+      content << "\n"
     end
+
+    return content
+  end
 end