chef 11.6.2-x86-mingw32 → 11.8.0.rc.1-x86-mingw32

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

@@ -6,9 +6,9 @@
 # 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.
@@ -32,8 +32,8 @@ class Chef
 
         def define_resource_requirements
           super
-          requirements.assert(:all_actions) do |a| 
-            a.assertion { ::File.exists?("/usr/sbin/groupmod") } 
+          requirements.assert(:all_actions) do |a|
+            a.assertion { ::File.exists?("/usr/sbin/groupmod") }
             a.failure_message Chef::Exceptions::Group, "Could not find binary /usr/sbin/groupmod for #{@new_resource.name}"
             # No whyrun alternative: this component should be available in the base install of any given system that uses it
           end

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

@@ -6,9 +6,9 @@
 # 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.
@@ -22,7 +22,7 @@ class Chef
   class Provider
     class Group
       class Usermod < Chef::Provider::Group::Groupadd
-        
+
         def load_current_resource
           super
         end
@@ -30,24 +30,24 @@ class Chef
         def define_resource_requirements
           super
 
-          requirements.assert(:all_actions) do |a| 
-            a.assertion { ::File.exists?("/usr/sbin/usermod") } 
+          requirements.assert(:all_actions) do |a|
+            a.assertion { ::File.exists?("/usr/sbin/usermod") }
             a.failure_message Chef::Exceptions::Group, "Could not find binary /usr/sbin/usermod for #{@new_resource}"
             # No whyrun alternative: this component should be available in the base install of any given system that uses it
           end
 
           requirements.assert(:modify, :create) do |a|
-            a.assertion { @new_resource.members.empty? || @new_resource.append } 
+            a.assertion { @new_resource.members.empty? || @new_resource.append }
             a.failure_message Chef::Exceptions::Group, "setting group members directly is not supported by #{self.to_s}, must set append true in group"
             # No whyrun alternative - this action is simply not supported.
           end
         end
-        
+
         def modify_group_members
           case node[:platform]
           when "openbsd", "netbsd", "aix", "solaris2", "smartos"
             append_flags = "-G"
-          when "solaris", "suse"
+          when "solaris", "suse", "opensuse"
             append_flags = "-a -G"
           end
 

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

@@ -6,9 +6,9 @@
 # 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.
@@ -25,16 +25,16 @@ class Chef
   class Provider
     class Group
       class Windows < Chef::Provider::Group
-        
+
         def initialize(new_resource,run_context)
           super
-          @net_group = Chef::Util::Windows::NetGroup.new(@new_resource.name)
+          @net_group = Chef::Util::Windows::NetGroup.new(@new_resource.group_name)
         end
 
         def load_current_resource
           @current_resource = Chef::Resource::Group.new(@new_resource.name)
           @current_resource.group_name(@new_resource.group_name)
-        
+
           members = nil
           begin
             members = @net_group.local_get_members
@@ -49,12 +49,12 @@ class Chef
 
           @current_resource
         end
-        
+
         def create_group
           @net_group.local_add
           manage_group
         end
-        
+
         def manage_group
           if @new_resource.append
             begin
@@ -68,11 +68,11 @@ class Chef
             @net_group.local_set_members(@new_resource.members)
           end
         end
-        
+
         def remove_group
           @net_group.local_delete
         end
-        
+
       end
     end
   end

data/lib/chef/provider/http_request.rb

@@ -17,26 +17,27 @@
 #
 
 require 'tempfile'
+require 'chef/http/simple'
 
 class Chef
   class Provider
     class HttpRequest < Chef::Provider
 
-      attr_accessor :rest
+      attr_accessor :http
 
       def whyrun_supported?
         true
       end
 
       def load_current_resource
-        @rest = Chef::REST.new(@new_resource.url, nil, nil)
+        @http = Chef::HTTP::Simple.new(@new_resource.url)
       end
 
       # Send a HEAD request to @new_resource.url, with ?message=@new_resource.message
       def action_head
         message = check_message(@new_resource.message)
         # returns true from Chef::REST if returns 2XX (Net::HTTPSuccess)
-        modified = @rest.head(
+        modified = @http.head(
           "#{@new_resource.url}?message=#{message}",
           @new_resource.headers
         )
@@ -53,9 +54,8 @@ class Chef
         converge_by("#{@new_resource} GET to #{@new_resource.url}") do
 
           message = check_message(@new_resource.message)
-          body = @rest.get(
+          body = @http.get(
             "#{@new_resource.url}?message=#{message}",
-            false,
             @new_resource.headers
           )
           Chef::Log.info("#{@new_resource} GET to #{@new_resource.url} successful")
@@ -67,7 +67,7 @@ class Chef
       def action_put
         converge_by("#{@new_resource} PUT to #{@new_resource.url}") do
           message = check_message(@new_resource.message)
-          body = @rest.put(
+          body = @http.put(
             "#{@new_resource.url}",
             message,
             @new_resource.headers
@@ -81,7 +81,7 @@ class Chef
       def action_post
         converge_by("#{@new_resource} POST to #{@new_resource.url}") do
           message = check_message(@new_resource.message)
-          body = @rest.post(
+          body = @http.post(
             "#{@new_resource.url}",
             message,
             @new_resource.headers
@@ -94,7 +94,7 @@ class Chef
       # Send a DELETE request to @new_resource.url
       def action_delete
         converge_by("#{@new_resource} DELETE to #{@new_resource.url}") do
-          body = @rest.delete(
+          body = @http.delete(
             "#{@new_resource.url}",
             @new_resource.headers
           )

data/lib/chef/provider/ifconfig.rb

@@ -26,11 +26,11 @@ require 'erb'
 #
 #    int = {Hash with your network settings...}
 #
-#    ifconfig  int['ip'] do 
-#      ignore_failure  true 
-#      device  int['dev'] 
-#      mask    int['mask']  
-#      gateway int['gateway'] 
+#    ifconfig  int['ip'] do
+#      ignore_failure  true
+#      device  int['dev']
+#      mask    int['mask']
+#      gateway int['gateway']
 #      mtu     int['mtu']
 #    end
 
@@ -76,7 +76,7 @@ class Chef
               @interface = @interfaces.fetch(@new_resource.device)
 
               @current_resource.target(@new_resource.target)
-              @current_resource.device(@int_name)
+              @current_resource.device(@new_resource.device)
               @current_resource.inet_addr(@interface["inet_addr"])
               @current_resource.hwaddr(@interface["hwaddr"])
               @current_resource.bcast(@interface["bcast"])
@@ -89,12 +89,12 @@ class Chef
         @current_resource
       end
 
-      def define_resource_requirements 
-        requirements.assert(:all_actions) do |a| 
+      def define_resource_requirements
+        requirements.assert(:all_actions) do |a|
           a.assertion { @status.exitstatus == 0 }
           a.failure_message Chef::Exceptions::Ifconfig, "ifconfig failed - #{@status.inspect}!"
           # no whyrun - if the base ifconfig used in load_current_resource fails
-          # there's no reasonable action that could have been taken in the course of 
+          # there's no reasonable action that could have been taken in the course of
           # a chef run to fix it.
         end
       end
@@ -102,40 +102,32 @@ class Chef
       def action_add
         # check to see if load_current_resource found interface in ifconfig
         unless @current_resource.inet_addr
-          unless @new_resource.device == "lo"
-            command = "ifconfig #{@new_resource.device} #{@new_resource.name}"
-            command << " netmask #{@new_resource.mask}" if @new_resource.mask
-            command << " metric #{@new_resource.metric}" if @new_resource.metric
-            command << " mtu #{@new_resource.mtu}" if @new_resource.mtu
-          end
-          converge_by ("run #{command} to add #{@new_resource}") do
-            run_command(
-              :command => command
-            )
-            Chef::Log.info("#{@new_resource} added")
+          unless @new_resource.device == loopback_device
+            command = add_command
+            converge_by ("run #{command} to add #{@new_resource}") do
+              run_command(
+                :command => command
+              )
+              Chef::Log.info("#{@new_resource} added")
+              # Write out the config files
+              generate_config
+            end
           end
         end
-
-        # Write out the config files
-        generate_config
       end
 
       def action_enable
         # check to see if load_current_resource found ifconfig
         # enables, but does not manage config files
         unless @current_resource.inet_addr
-          unless @new_resource.device == "lo"
-            command = "ifconfig #{@new_resource.device} #{@new_resource.name}"
-            command << " netmask #{@new_resource.mask}" if @new_resource.mask
-            command << " metric #{@new_resource.metric}" if @new_resource.metric
-            command << " mtu #{@new_resource.mtu}" if @new_resource.mtu
-          end
-
-          converge_by ("run #{command} to enable #{@new_resource}") do
-            run_command(
-              :command => command
-            )
-            Chef::Log.info("#{@new_resource} enabled")
+          unless @new_resource.device == loopback_device
+            command = enable_command
+            converge_by ("run #{command} to enable #{@new_resource}") do
+              run_command(
+                :command => command
+              )
+              Chef::Log.info("#{@new_resource} enabled")
+            end
           end
         end
       end
@@ -143,7 +135,7 @@ class Chef
       def action_delete
         # check to see if load_current_resource found the interface
         if @current_resource.device
-          command = "ifconfig #{@new_resource.device} down"
+          command = delete_command
           converge_by ("run #{command} to delete #{@new_resource}") do
             run_command(
               :command => command
@@ -160,7 +152,7 @@ class Chef
         # check to see if load_current_resource found the interface
         # disables, but leaves config files in place.
         if @current_resource.device
-          command = "ifconfig #{@new_resource.device} down"
+          command = disable_command
           converge_by ("run #{command} to disable #{@new_resource}") do
             run_command(
               :command => command
@@ -199,6 +191,34 @@ class Chef
         Chef::Log.info("#{@new_resource} deleted configuration file")
       end
 
+      private
+      def add_command
+        command = "ifconfig #{@new_resource.device} #{@new_resource.name}"
+        command << " netmask #{@new_resource.mask}" if @new_resource.mask
+        command << " metric #{@new_resource.metric}" if @new_resource.metric
+        command << " mtu #{@new_resource.mtu}" if @new_resource.mtu
+        command
+      end
+
+      def enable_command
+        command = "ifconfig #{@new_resource.device} #{@new_resource.name}"
+        command << " netmask #{@new_resource.mask}" if @new_resource.mask
+        command << " metric #{@new_resource.metric}" if @new_resource.metric
+        command << " mtu #{@new_resource.mtu}" if @new_resource.mtu
+        command
+      end
+
+      def disable_command
+        "ifconfig #{@new_resource.device} down"
+      end
+
+      def delete_command
+        "ifconfig #{@new_resource.device} down"
+      end
+
+      def loopback_device
+        'lo'
+      end
     end
   end
 end

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

@@ -0,0 +1,99 @@
+#
+# Author:: Kaustubh Deorukhkar (kaustubh@clogeny.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/provider/ifconfig'
+
+class Chef
+  class Provider
+    class Ifconfig
+      class Aix < Chef::Provider::Ifconfig
+
+        def load_current_resource
+          @current_resource = Chef::Resource::Ifconfig.new(@new_resource.name)
+
+          @interface_exists = false
+          found_interface = false
+          interface = {}
+
+          @status = popen4("ifconfig -a") do |pid, stdin, stdout, stderr|
+            stdout.each do |line|
+
+              if !found_interface
+                if line =~ /^(\S+):\sflags=(\S+)/
+                  # We have interface name, if this is the interface for @current_resource, load info else skip till next interface is found.
+                  if $1 == @new_resource.device
+                    # Found interface
+                    found_interface = true
+                    @interface_exists = true
+                    @current_resource.target(@new_resource.target)
+                    @current_resource.device($1)
+                    interface[:flags] = $2
+                    @current_resource.metric($1) if line =~ /metric\s(\S+)/
+                  end
+                end
+              else
+                # parse interface related information, stop when next interface is found.
+                if line =~ /^(\S+):\sflags=(\S+)/
+                  # we are done parsing interface info and hit another one, so stop.
+                  found_interface = false
+                  break
+                else
+                  if found_interface
+                    # read up interface info
+                    @current_resource.inet_addr($1) if line =~ /inet\s(\S+)\s/
+                    @current_resource.bcast($1) if line =~ /broadcast\s(\S+)/
+                    @current_resource.mask(hex_to_dec_netmask($1)) if line =~ /netmask\s(\S+)\s/
+                  end
+                end
+              end
+            end
+          end
+
+          @current_resource
+        end
+
+        private
+        def add_command
+          # ifconfig changes are temporary, chdev persist across reboots.
+          raise Chef::Exceptions::Ifconfig, "interface metric attribute cannot be set for :add action" if @new_resource.metric
+          command = "chdev -l #{@new_resource.device} -a netaddr=#{@new_resource.name}"
+          command << " -a netmask=#{@new_resource.mask}" if @new_resource.mask
+          command << " -a mtu=#{@new_resource.mtu}" if @new_resource.mtu
+          command
+        end
+
+        def delete_command
+          # ifconfig changes are temporary, chdev persist across reboots.
+          "chdev -l #{@new_resource.device} -a state=down"
+        end
+
+        def loopback_device
+          "lo0"
+        end
+
+        def hex_to_dec_netmask(netmask)
+          # example '0xffff0000' -> '255.255.0.0'
+          dec = netmask[2..3].to_i(16).to_s(10)
+          [4,6,8].each { |n| dec = dec + "." + netmask[n..n+1].to_i(16).to_s(10) }
+          dec
+        end
+
+      end
+    end
+  end
+end