cheffish 1.3.1 → 1.4.0

data/lib/chef/provider/chef_node.rb

@@ -1,82 +1,87 @@
-require 'cheffish/chef_provider_base'
-require 'chef/resource/chef_node'
-require 'chef/chef_fs/data_handler/node_data_handler'
-
-class Chef::Provider::ChefNode < Cheffish::ChefProviderBase
-
-  def whyrun_supported?
-    true
-  end
-
-  action :create do
-    differences = json_differences(current_json, new_json)
-
-    if current_resource_exists?
-      if differences.size > 0
-        description = [ "update node #{new_resource.name} at #{rest.url}" ] + differences
-        converge_by description do
-          rest.put("nodes/#{new_resource.name}", normalize_for_put(new_json))
-        end
-      end
-    else
-      description = [ "create node #{new_resource.name} at #{rest.url}" ] + differences
-      converge_by description do
-        rest.post("nodes", normalize_for_post(new_json))
-      end
-    end
-  end
-
-  action :delete do
-    if current_resource_exists?
-      converge_by "delete node #{new_resource.name} at #{rest.url}" do
-        rest.delete("nodes/#{new_resource.name}")
-      end
-    end
-  end
-
-  def load_current_resource
-    begin
-      @current_resource = json_to_resource(rest.get("nodes/#{new_resource.name}"))
-    rescue Net::HTTPServerException => e
-      if e.response.code == "404"
-        @current_resource = not_found_resource
-      else
-        raise
-      end
-    end
-  end
-
-  def augment_new_json(json)
-    # Preserve tags even if "attributes" was overwritten directly
-    json['normal']['tags'] = current_json['normal']['tags'] unless json['normal']['tags']
-    # Apply modifiers
-    json['run_list'] = apply_run_list_modifiers(new_resource.run_list_modifiers, new_resource.run_list_removers, json['run_list'])
-    json['normal'] = apply_modifiers(new_resource.attribute_modifiers, json['normal'])
-    # Preserve default/override/automatic even when "complete true"
-    json['default'] = current_json['default']
-    json['override'] = current_json['override']
-    json['automatic'] = current_json['automatic']
-    json
-  end
-
-  #
-  # Helpers
-  #
-
-  def resource_class
-    Chef::Resource::ChefNode
-  end
-
-  def data_handler
-    Chef::ChefFS::DataHandler::NodeDataHandler.new
-  end
-
-  def keys
-    {
-      'name' => :name,
-      'chef_environment' => :chef_environment,
-      'run_list' => :run_list,
-      'normal' => :attributes
-    }
-  end
-end
+require 'cheffish/chef_provider_base'
+require 'chef/resource/chef_node'
+require 'chef/chef_fs/data_handler/node_data_handler'
+
+class Chef
+  class Provider
+    class ChefNode < Cheffish::ChefProviderBase
+      provides :chef_node
+
+      def whyrun_supported?
+        true
+      end
+
+      action :create do
+        differences = json_differences(current_json, new_json)
+
+        if current_resource_exists?
+          if differences.size > 0
+            description = [ "update node #{new_resource.name} at #{rest.url}" ] + differences
+            converge_by description do
+              rest.put("nodes/#{new_resource.name}", normalize_for_put(new_json))
+            end
+          end
+        else
+          description = [ "create node #{new_resource.name} at #{rest.url}" ] + differences
+          converge_by description do
+            rest.post("nodes", normalize_for_post(new_json))
+          end
+        end
+      end
+
+      action :delete do
+        if current_resource_exists?
+          converge_by "delete node #{new_resource.name} at #{rest.url}" do
+            rest.delete("nodes/#{new_resource.name}")
+          end
+        end
+      end
+
+      def load_current_resource
+        begin
+          @current_resource = json_to_resource(rest.get("nodes/#{new_resource.name}"))
+        rescue Net::HTTPServerException => e
+          if e.response.code == "404"
+            @current_resource = not_found_resource
+          else
+            raise
+          end
+        end
+      end
+
+      def augment_new_json(json)
+        # Preserve tags even if "attributes" was overwritten directly
+        json['normal']['tags'] = current_json['normal']['tags'] unless json['normal']['tags']
+        # Apply modifiers
+        json['run_list'] = apply_run_list_modifiers(new_resource.run_list_modifiers, new_resource.run_list_removers, json['run_list'])
+        json['normal'] = apply_modifiers(new_resource.attribute_modifiers, json['normal'])
+        # Preserve default/override/automatic even when "complete true"
+        json['default'] = current_json['default']
+        json['override'] = current_json['override']
+        json['automatic'] = current_json['automatic']
+        json
+      end
+
+      #
+      # Helpers
+      #
+
+      def resource_class
+        Chef::Resource::ChefNode
+      end
+
+      def data_handler
+        Chef::ChefFS::DataHandler::NodeDataHandler.new
+      end
+
+      def keys
+        {
+          'name' => :name,
+          'chef_environment' => :chef_environment,
+          'run_list' => :run_list,
+          'normal' => :attributes
+        }
+      end
+    end
+  end
+end

data/lib/chef/provider/chef_organization.rb

@@ -1,150 +1,155 @@
-require 'cheffish/chef_provider_base'
-require 'chef/resource/chef_organization'
-require 'chef/chef_fs/data_handler/data_handler_base'
-
-class Chef::Provider::ChefOrganization < Cheffish::ChefProviderBase
-
-  def whyrun_supported?
-    true
-  end
-
-  action :create do
-    differences = json_differences(current_json, new_json)
-
-    if current_resource_exists?
-      if differences.size > 0
-        description = [ "update organization #{new_resource.name} at #{rest.url}" ] + differences
-        converge_by description do
-          rest.put("#{rest.root_url}/organizations/#{new_resource.name}", normalize_for_put(new_json))
-        end
-      end
-    else
-      description = [ "create organization #{new_resource.name} at #{rest.url}" ] + differences
-      converge_by description do
-        rest.post("#{rest.root_url}/organizations", normalize_for_post(new_json))
-      end
-    end
-
-    # Revoke invites and memberships when asked
-    invites_to_remove.each do |user|
-      if outstanding_invites.has_key?(user)
-        converge_by "revoke #{user}'s invitation to organization #{new_resource.name}" do
-          rest.delete("#{rest.root_url}/organizations/#{new_resource.name}/association_requests/#{outstanding_invites[user]}")
-        end
-      end
-    end
-    members_to_remove.each do |user|
-      if existing_members.include?(user)
-        converge_by "remove #{user} from organization #{new_resource.name}" do
-          rest.delete("#{rest.root_url}/organizations/#{new_resource.name}/users/#{user}")
-        end
-      end
-    end
-
-    # Invite and add members when asked
-    new_resource.invites.each do |user|
-      if !existing_members.include?(user) && !outstanding_invites.has_key?(user)
-        converge_by "invite #{user} to organization #{new_resource.name}" do
-          rest.post("#{rest.root_url}/organizations/#{new_resource.name}/association_requests", { 'user' => user })
-        end
-      end
-    end
-    new_resource.members.each do |user|
-      if !existing_members.include?(user)
-        converge_by "Add #{user} to organization #{new_resource.name}" do
-          rest.post("#{rest.root_url}/organizations/#{new_resource.name}/users/#{user}", {})
-        end
-      end
-    end
-  end
-
-  def existing_members
-    @existing_members ||= rest.get("#{rest.root_url}/organizations/#{new_resource.name}/users").map { |u| u['user']['username'] }
-  end
-
-  def outstanding_invites
-    @outstanding_invites ||= begin
-      invites = {}
-      rest.get("#{rest.root_url}/organizations/#{new_resource.name}/association_requests").each do |r|
-        invites[r['username']] = r['id']
-      end
-      invites
-    end
-  end
-
-  def invites_to_remove
-    if new_resource.complete
-      if new_resource.invites_specified? || new_resource.members_specified?
-        outstanding_invites.keys - (new_resource.invites | new_resource.members)
-      else
-        []
-      end
-    else
-      new_resource.remove_members
-    end
-  end
-
-  def members_to_remove
-    if new_resource.complete
-      if new_resource.members_specified?
-        existing_members - (new_resource.invites | new_resource.members)
-      else
-        []
-      end
-    else
-      new_resource.remove_members
-    end
-  end
-
-  action :delete do
-    if current_resource_exists?
-      converge_by "delete organization #{new_resource.name} at #{rest.url}" do
-        rest.delete("#{rest.root_url}/organizations/#{new_resource.name}")
-      end
-    end
-  end
-
-  def load_current_resource
-    begin
-      @current_resource = json_to_resource(rest.get("#{rest.root_url}/organizations/#{new_resource.name}"))
-    rescue Net::HTTPServerException => e
-      if e.response.code == "404"
-        @current_resource = not_found_resource
-      else
-        raise
-      end
-    end
-  end
-
-  #
-  # Helpers
-  #
-
-  def resource_class
-    Chef::Resource::ChefOrganization
-  end
-
-  def data_handler
-    OrganizationDataHandler.new
-  end
-
-  def keys
-    {
-      'name' => :name,
-      'full_name' => :full_name
-    }
-  end
-
-  class OrganizationDataHandler < Chef::ChefFS::DataHandler::DataHandlerBase
-    def normalize(organization, entry)
-      # Normalize the order of the keys for easier reading
-      normalize_hash(organization, {
-        'name' => remove_dot_json(entry.name),
-        'full_name' => remove_dot_json(entry.name),
-        'org_type' => 'Business',
-        'clientname' => "#{remove_dot_json(entry.name)}-validator",
-        'billing_plan' => 'platform-free'
-      })
-    end
-  end
-end
+require 'cheffish/chef_provider_base'
+require 'chef/resource/chef_organization'
+require 'chef/chef_fs/data_handler/data_handler_base'
+
+class Chef
+  class Provider
+    class ChefOrganization < Cheffish::ChefProviderBase
+      provides :chef_organization
+
+      def whyrun_supported?
+        true
+      end
+
+      action :create do
+        differences = json_differences(current_json, new_json)
+
+        if current_resource_exists?
+          if differences.size > 0
+            description = [ "update organization #{new_resource.name} at #{rest.url}" ] + differences
+            converge_by description do
+              rest.put("#{rest.root_url}/organizations/#{new_resource.name}", normalize_for_put(new_json))
+            end
+          end
+        else
+          description = [ "create organization #{new_resource.name} at #{rest.url}" ] + differences
+          converge_by description do
+            rest.post("#{rest.root_url}/organizations", normalize_for_post(new_json))
+          end
+        end
+
+        # Revoke invites and memberships when asked
+        invites_to_remove.each do |user|
+          if outstanding_invites.has_key?(user)
+            converge_by "revoke #{user}'s invitation to organization #{new_resource.name}" do
+              rest.delete("#{rest.root_url}/organizations/#{new_resource.name}/association_requests/#{outstanding_invites[user]}")
+            end
+          end
+        end
+        members_to_remove.each do |user|
+          if existing_members.include?(user)
+            converge_by "remove #{user} from organization #{new_resource.name}" do
+              rest.delete("#{rest.root_url}/organizations/#{new_resource.name}/users/#{user}")
+            end
+          end
+        end
+
+        # Invite and add members when asked
+        new_resource.invites.each do |user|
+          if !existing_members.include?(user) && !outstanding_invites.has_key?(user)
+            converge_by "invite #{user} to organization #{new_resource.name}" do
+              rest.post("#{rest.root_url}/organizations/#{new_resource.name}/association_requests", { 'user' => user })
+            end
+          end
+        end
+        new_resource.members.each do |user|
+          if !existing_members.include?(user)
+            converge_by "Add #{user} to organization #{new_resource.name}" do
+              rest.post("#{rest.root_url}/organizations/#{new_resource.name}/users/", { 'username' => user })
+            end
+          end
+        end
+      end
+
+      def existing_members
+        @existing_members ||= rest.get("#{rest.root_url}/organizations/#{new_resource.name}/users").map { |u| u['user']['username'] }
+      end
+
+      def outstanding_invites
+        @outstanding_invites ||= begin
+          invites = {}
+          rest.get("#{rest.root_url}/organizations/#{new_resource.name}/association_requests").each do |r|
+            invites[r['username']] = r['id']
+          end
+          invites
+        end
+      end
+
+      def invites_to_remove
+        if new_resource.complete
+          if new_resource.invites_specified? || new_resource.members_specified?
+            outstanding_invites.keys - (new_resource.invites | new_resource.members)
+          else
+            []
+          end
+        else
+          new_resource.remove_members
+        end
+      end
+
+      def members_to_remove
+        if new_resource.complete
+          if new_resource.members_specified?
+            existing_members - (new_resource.invites | new_resource.members)
+          else
+            []
+          end
+        else
+          new_resource.remove_members
+        end
+      end
+
+      action :delete do
+        if current_resource_exists?
+          converge_by "delete organization #{new_resource.name} at #{rest.url}" do
+            rest.delete("#{rest.root_url}/organizations/#{new_resource.name}")
+          end
+        end
+      end
+
+      def load_current_resource
+        begin
+          @current_resource = json_to_resource(rest.get("#{rest.root_url}/organizations/#{new_resource.name}"))
+        rescue Net::HTTPServerException => e
+          if e.response.code == "404"
+            @current_resource = not_found_resource
+          else
+            raise
+          end
+        end
+      end
+
+      #
+      # Helpers
+      #
+
+      def resource_class
+        Chef::Resource::ChefOrganization
+      end
+
+      def data_handler
+        OrganizationDataHandler.new
+      end
+
+      def keys
+        {
+          'name' => :name,
+          'full_name' => :full_name
+        }
+      end
+
+      class OrganizationDataHandler < Chef::ChefFS::DataHandler::DataHandlerBase
+        def normalize(organization, entry)
+          # Normalize the order of the keys for easier reading
+          normalize_hash(organization, {
+            'name' => remove_dot_json(entry.name),
+            'full_name' => remove_dot_json(entry.name),
+            'org_type' => 'Business',
+            'clientname' => "#{remove_dot_json(entry.name)}-validator",
+            'billing_plan' => 'platform-free'
+          })
+        end
+      end
+    end
+  end
+end