chef 11.4.4 → 11.6.0.hotfix.1

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

@@ -0,0 +1,39 @@
+#
+# Author:: Lamont Granquist (<lamont@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.
+#
+
+require 'chef/file_content_management/content_base'
+require 'chef/file_content_management/tempfile'
+
+class Chef
+  class Provider
+    class File
+      class Content < Chef::FileContentManagement::ContentBase
+        def file_for_provider
+          if @new_resource.content
+            tempfile = Chef::FileContentManagement::Tempfile.new(@new_resource).tempfile
+            tempfile.write(@new_resource.content)
+            tempfile.close
+            tempfile
+          else
+            nil
+          end
+        end
+      end
+    end
+  end
+end

data/lib/chef/provider/git.rb

@@ -21,14 +21,13 @@ require 'chef/log'
 require 'chef/provider'
 require 'chef/mixin/shell_out'
 require 'fileutils'
-require 'shellwords'
 
 class Chef
   class Provider
     class Git < Chef::Provider
 
       include Chef::Mixin::ShellOut
-      
+
       def whyrun_supported?
         true
       end
@@ -42,7 +41,7 @@ class Chef
       end
 
       def define_resource_requirements
-        # Parent directory of the target must exist. 
+        # Parent directory of the target must exist.
         requirements.assert(:checkout, :sync) do |a|
           dirname = ::File.dirname(@new_resource.destination)
           a.assertion { ::File.directory?(dirname) }
@@ -62,16 +61,16 @@ class Chef
         end
 
         requirements.assert(:all_actions) do |a|
-          # this can't be recovered from in why-run mode, because nothing that 
-          # we do in the course of a run is likely to create a valid target_revision 
+          # this can't be recovered from in why-run mode, because nothing that
+          # we do in the course of a run is likely to create a valid target_revision
           # if we can't resolve it up front.
           a.assertion { target_revision != nil }
-          a.failure_message Chef::Exceptions::UnresolvableGitReference, 
+          a.failure_message Chef::Exceptions::UnresolvableGitReference,
             "Unable to parse SHA reference for '#{@new_resource.revision}' in repository '#{@new_resource.repository}'. " +
-            "Verify your (case-sensitive) repository URL and revision.\n" + 
+            "Verify your (case-sensitive) repository URL and revision.\n" +
             "`git ls-remote` output: #{@resolved_reference}"
         end
-      end 
+      end
 
       def action_checkout
         if target_dir_non_existent_or_empty?
@@ -86,7 +85,7 @@ class Chef
 
       def action_export
         action_checkout
-        converge_by("complete the export by removing #{@new_resource.destination}.git after checkout") do 
+        converge_by("complete the export by removing #{@new_resource.destination}.git after checkout") do
           FileUtils.rm_rf(::File.join(@new_resource.destination,".git"))
         end
       end
@@ -129,16 +128,13 @@ class Chef
           @new_resource.additional_remotes.each_pair do |remote_name, remote_url|
             converge_by("add remote #{remote_name} from #{remote_url}") do
               Chef::Log.info "#{@new_resource} adding git remote #{remote_name} = #{remote_url}"
-              command = "git remote add #{remote_name} #{remote_url}"
-              if shell_out(command, run_options(:cwd => @new_resource.destination, :log_level => :info)).exitstatus != 0
-                @new_resource.updated_by_last_action(true)
-              end
+              setup_remote_tracking_branches(remote_name, remote_url)
             end
           end
         end
       end
 
-      def clone 
+      def clone
         converge_by("clone from #{@new_resource.repository} into #{@new_resource.destination}") do
           remote = @new_resource.remote
 
@@ -148,8 +144,8 @@ class Chef
 
           Chef::Log.info "#{@new_resource} cloning repo #{@new_resource.repository} to #{@new_resource.destination}"
 
-          clone_cmd = "git clone #{args.join(' ')} #{@new_resource.repository} #{Shellwords.escape @new_resource.destination}"
-          shell_out!(clone_cmd, run_options(:log_level => :info))
+          clone_cmd = "git clone #{args.join(' ')} \"#{@new_resource.repository}\" \"#{@new_resource.destination}\""
+          shell_out!(clone_cmd, run_options)
         end
       end
 
@@ -164,17 +160,20 @@ class Chef
 
       def enable_submodules
         if @new_resource.enable_submodules
-          converge_by("enable git submodules for #{@new_resource}") do 
+          converge_by("enable git submodules for #{@new_resource}") do
+            Chef::Log.info "#{@new_resource} synchronizing git submodules"
+            command = "git submodule sync"
+            shell_out!(command, run_options(:cwd => @new_resource.destination))
             Chef::Log.info "#{@new_resource} enabling git submodules"
             # the --recursive flag means we require git 1.6.5+ now, see CHEF-1827
             command = "git submodule update --init --recursive"
-            shell_out!(command, run_options(:cwd => @new_resource.destination, :log_level => :info))
+            shell_out!(command, run_options(:cwd => @new_resource.destination))
           end
         end
       end
 
       def fetch_updates
-        setup_remote_tracking_branches if @new_resource.remote != 'origin'
+        setup_remote_tracking_branches(@new_resource.remote, @new_resource.repository)
         converge_by("fetch updates for #{@new_resource.remote}") do
           # since we're in a local branch already, just reset to specified revision rather than merge
           fetch_command = "git fetch #{@new_resource.remote} && git fetch #{@new_resource.remote} --tags && git reset --hard #{target_revision}"
@@ -183,23 +182,38 @@ class Chef
         end
       end
 
-      # Use git-config to setup a remote tracking branches. Could use
-      # git-remote but it complains when a remote of the same name already
-      # exists, git-config will just silenty overwrite the setting every
-      # time. This could cause wierd-ness in the remote cache if the url
-      # changes between calls, but as long as the repositories are all
-      # based from each other it should still work fine.
-      def setup_remote_tracking_branches
-        command = []
-        converge_by("set up remote tracking branches for #{@new_resource.repository} at #{@new_resource.remote}") do
-          Chef::Log.debug "#{@new_resource} configuring remote tracking branches for repository #{@new_resource.repository} "+
-                          "at remote #{@new_resource.remote}"
-          command << "git config remote.#{@new_resource.remote}.url #{@new_resource.repository}"
-          command << "git config remote.#{@new_resource.remote}.fetch +refs/heads/*:refs/remotes/#{@new_resource.remote}/*"
-          shell_out!(command.join(" && "), run_options(:cwd => @new_resource.destination))
+      def setup_remote_tracking_branches(remote_name, remote_url)
+        converge_by("set up remote tracking branches for #{remote_url} at #{remote_name}") do
+          Chef::Log.debug "#{@new_resource} configuring remote tracking branches for repository #{remote_url} "+
+            "at remote #{remote_name}"
+          check_remote_command = "git config --get remote.#{remote_name}.url"
+          remote_status = shell_out!(check_remote_command, run_options(:cwd => @new_resource.destination, :returns => [0,1,2]))
+          case remote_status.exitstatus
+          when 0, 2
+            # * Status 0 means that we already have a remote with this name, so we should update the url
+            #   if it doesn't match the url we want.
+            # * Status 2 means that we have multiple urls assigned to the same remote (not a good idea)
+            #   which we can fix by replacing them all with our target url (hence the --replace-all option)
+
+            if multiple_remotes?(remote_status) || !remote_matches?(remote_url,remote_status)
+              update_remote_url_command = "git config --replace-all remote.#{remote_name}.url #{remote_url}"
+              shell_out!(update_remote_url_command, run_options(:cwd => @new_resource.destination))
+            end
+          when 1
+            add_remote_command = "git remote add #{remote_name} #{remote_url}"
+            shell_out!(add_remote_command, run_options(:cwd => @new_resource.destination))
+          end
         end
       end
 
+      def multiple_remotes?(check_remote_command_result)
+        check_remote_command_result.exitstatus == 2
+      end
+
+      def remote_matches?(remote_url, check_remote_command_result)
+        check_remote_command_result.stdout.strip.eql?(remote_url)
+      end
+
       def current_revision_matches_target_revision?
         (!@current_resource.revision.nil?) && (target_revision.strip.to_i(16) == @current_resource.revision.strip.to_i(16))
       end
@@ -218,12 +232,37 @@ class Chef
 
       def remote_resolve_reference
         Chef::Log.debug("#{@new_resource} resolving remote reference")
-        command = git('ls-remote', @new_resource.repository, @new_resource.revision)
+        # The sha pointed to by an annotated tag is identified by the
+        # '^{}' suffix appended to the tag. In order to resolve
+        # annotated tags, we have to search for "revision*" and
+        # post-process. Special handling for 'HEAD' to ignore a tag
+        # named 'HEAD'.
+        rev_pattern = case @new_resource.revision
+                      when '', 'HEAD'
+                        'HEAD'
+                      else
+                        @new_resource.revision + '*'
+                      end
+        command = git("ls-remote \"#{@new_resource.repository}\"", rev_pattern)
         @resolved_reference = shell_out!(command, run_options).stdout
-        if  @resolved_reference =~ /^([0-9a-f]{40})\s+(\S+)/
-          $1
+        ref_lines = @resolved_reference.split("\n")
+        refs = ref_lines.map { |line| line.split("\t") }
+        # first try for ^{} indicating the commit pointed to by an
+        # annotated tag
+        tagged_commit = refs.find { |m| m[1].end_with?("#{@new_resource.revision}^{}") }
+        # It is possible for a user to create a tag named 'HEAD'.
+        # Using such a degenerate annotated tag would be very
+        # confusing. We avoid the issue by disallowing the use of
+        # annotated tags named 'HEAD'.
+        if tagged_commit && rev_pattern != 'HEAD'
+          tagged_commit[0]
         else
-          nil
+          found = refs.find { |m| m[1].end_with?(@new_resource.revision) }
+          if found
+            found[0]
+          else
+            nil
+          end
         end
       end
 
@@ -234,12 +273,6 @@ class Chef
         run_opts[:group] = @new_resource.group if @new_resource.group
         run_opts[:environment] = {"GIT_SSH" => @new_resource.ssh_wrapper} if @new_resource.ssh_wrapper
         run_opts[:log_tag] = @new_resource.to_s
-        run_opts[:log_level] ||= :debug
-        if run_opts[:log_level] == :info
-          if STDOUT.tty? && !Chef::Config[:daemon] && Chef::Log.info?
-            run_opts[:live_stream] = STDOUT
-          end
-        end
         run_opts
       end
 

data/lib/chef/provider/group/usermod.rb

@@ -45,9 +45,9 @@ class Chef
         
         def modify_group_members
           case node[:platform]
-          when "openbsd", "netbsd", "aix", "solaris2"
+          when "openbsd", "netbsd", "aix", "solaris2", "smartos"
             append_flags = "-G"
-          when "solaris"
+          when "solaris", "suse"
             append_flags = "-a -G"
           end
 

data/lib/chef/provider/ifconfig.rb

@@ -39,6 +39,15 @@ class Chef
     class Ifconfig < Chef::Provider
       include Chef::Mixin::Command
 
+      attr_accessor :config_template
+      attr_accessor :config_path
+
+      def initialize(new_resource, run_context)
+        super(new_resource, run_context)
+        @config_template = nil
+        @config_path = nil
+      end
+
       def whyrun_supported?
         true
       end
@@ -163,50 +172,31 @@ class Chef
         end
       end
 
+      def can_generate_config?
+        ! @config_template.nil? and ! @config_path.nil?
+      end
+
       def generate_config
+        return unless can_generate_config?
         b = binding
-        case node[:platform]
-        when "centos","redhat","fedora"
-          content = %{
-<% if @new_resource.device %>DEVICE=<%= @new_resource.device %><% end %>
-<% if @new_resource.onboot %>ONBOOT=<%= @new_resource.onboot %><% end %>
-<% if @new_resource.bootproto %>BOOTPROTO=<%= @new_resource.bootproto %><% end %>
-<% if @new_resource.target %>IPADDR=<%= @new_resource.target %><% end %>
-<% if @new_resource.mask %>NETMASK=<%= @new_resource.mask %><% end %>
-<% if @new_resource.network %>NETWORK=<%= @new_resource.network %><% end %>
-<% if @new_resource.bcast %>BROADCAST=<%= @new_resource.bcast %><% end %>
-<% if @new_resource.onparent %>ONPARENT=<%= @new_resource.onparent %><% end %>
-          }
-          template = ::ERB.new(content)
-          network_file_name = "/etc/sysconfig/network-scripts/ifcfg-#{@new_resource.device}"
-          converge_by ("generate configuration file : #{network_file_name}") do
-            network_file = ::File.new(network_file_name, "w")
-            network_file.puts(template.result(b))
-            network_file.close
-          end
-          Chef::Log.info("#{@new_resource} created configuration file")
-        when "debian","ubuntu"
-          # template
-        when "slackware"
-          # template
+        template = ::ERB.new(@config_template)
+        converge_by ("generate configuration file : #{@config_path}") do
+          network_file = ::File.new(@config_path, "w")
+          network_file.puts(template.result(b))
+          network_file.close
         end
+        Chef::Log.info("#{@new_resource} created configuration file")
       end
 
       def delete_config
+        return unless can_generate_config?
         require 'fileutils'
-        case node[:platform]
-        when "centos","redhat","fedora"
-          ifcfg_file = "/etc/sysconfig/network-scripts/ifcfg-#{@new_resource.device}"
-          if ::File.exist?(ifcfg_file)
-            converge_by ("delete the #{ifcfg_file}") do
-              FileUtils.rm_f(ifcfg_file, :verbose => false)
-            end
+        if ::File.exist?(@config_path)
+          converge_by ("delete the #{@config_path}") do
+            FileUtils.rm_f(@config_path, :verbose => false)
           end
-        when "debian","ubuntu"
-          # delete configs
-        when "slackware"
-          # delete configs
         end
+        Chef::Log.info("#{@new_resource} deleted configuration file")
       end
 
     end

data/lib/chef/provider/ifconfig/debian.rb

@@ -0,0 +1,71 @@
+#
+# Author:: Xabier de Zuazo (xabier@onddo.com)
+# Copyright:: Copyright (c) 2013 Onddo Labs, SL.
+# 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/provider/ifconfig'
+require 'chef/util/file_edit'
+
+class Chef
+  class Provider
+    class Ifconfig
+      class Debian < Chef::Provider::Ifconfig
+
+        def initialize(new_resource, run_context)
+          super(new_resource, run_context)
+          @config_template = %{
+<% if @new_resource.device %>
+<% if @new_resource.onboot == "yes" %>auto <%= @new_resource.device %><% end %>
+<% case @new_resource.bootproto
+   when "dhcp" %>
+iface <%= @new_resource.device %> inet dhcp
+<% when "bootp" %>
+iface <%= @new_resource.device %> inet bootp
+<% else %>
+iface <%= @new_resource.device %> inet static
+    <% if @new_resource.target %>address <%= @new_resource.target %><% end %>
+    <% if @new_resource.mask %>netmask <%= @new_resource.mask %><% end %>
+    <% if @new_resource.network %>network <%= @new_resource.network %><% end %>
+    <% if @new_resource.bcast %>broadcast <%= @new_resource.bcast %><% end %>
+    <% if @new_resource.metric %>metric <%= @new_resource.metric %><% end %>
+    <% if @new_resource.hwaddr %>hwaddress <%= @new_resource.hwaddr %><% end %>
+    <% if @new_resource.mtu %>mtu <%= @new_resource.mtu %><% end %>
+<% end %>
+<% end %>
+          }
+          @config_path = "/etc/network/interfaces.d/ifcfg-#{@new_resource.device}"
+        end
+
+        def generate_config
+          check_interfaces_config
+          super
+        end
+
+        protected
+
+        def check_interfaces_config
+          converge_by ('modify configuration file : /etc/network/interfaces') do
+            Dir.mkdir('/etc/network/interfaces.d') unless ::File.directory?('/etc/network/interfaces.d')
+            conf = Chef::Util::FileEdit.new('/etc/network/interfaces')
+            conf.insert_line_if_no_match('^\s*source\s+/etc/network/interfaces[.]d/[*]\s*$', 'source /etc/network/interfaces.d/*')
+            conf.write_file
+          end
+        end
+
+      end
+    end
+  end
+end

data/lib/chef/provider/ifconfig/redhat.rb

@@ -0,0 +1,47 @@
+#
+# Author:: Xabier de Zuazo (xabier@onddo.com)
+# Copyright:: Copyright (c) 2013 Onddo Labs, SL.
+# 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/provider/ifconfig'
+
+class Chef
+  class Provider
+    class Ifconfig
+      class Redhat < Chef::Provider::Ifconfig
+
+        def initialize(new_resource, run_context)
+          super(new_resource, run_context)
+          @config_template = %{
+<% if @new_resource.device %>DEVICE=<%= @new_resource.device %><% end %>
+<% if @new_resource.onboot == "yes" %>ONBOOT=<%= @new_resource.onboot %><% end %>
+<% if @new_resource.bootproto %>BOOTPROTO=<%= @new_resource.bootproto %><% end %>
+<% if @new_resource.target %>IPADDR=<%= @new_resource.target %><% end %>
+<% if @new_resource.mask %>NETMASK=<%= @new_resource.mask %><% end %>
+<% if @new_resource.network %>NETWORK=<%= @new_resource.network %><% end %>
+<% if @new_resource.bcast %>BROADCAST=<%= @new_resource.bcast %><% end %>
+<% if @new_resource.onparent %>ONPARENT=<%= @new_resource.onparent %><% end %>
+<% if @new_resource.hwaddr %>HWADDR=<%= @new_resource.hwaddr %><% end %>
+<% if @new_resource.metric %>METRIC=<%= @new_resource.metric %><% end %>
+<% if @new_resource.mtu %>MTU=<%= @new_resource.mtu %><% end %>
+          }
+          @config_path = "/etc/sysconfig/network-scripts/ifcfg-#{@new_resource.device}"
+        end
+
+      end
+    end
+  end
+end