cheffish 4.0.0 → 4.1.0

data/lib/chef/resource/chef_node.rb

@@ -1,7 +1,7 @@
-require 'cheffish'
-require 'cheffish/base_resource'
-require 'chef/chef_fs/data_handler/node_data_handler'
-require 'cheffish/node_properties'
+require "cheffish"
+require "cheffish/base_resource"
+require "chef/chef_fs/data_handler/node_data_handler"
+require "cheffish/node_properties"
 
 class Chef
   class Resource
@@ -51,14 +51,14 @@ class Chef
 
         def augment_new_json(json)
           # Preserve tags even if "attributes" was overwritten directly
-          json['normal']['tags'] = current_json['normal']['tags'] unless json['normal']['tags']
+          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'])
+          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["default"] = current_json["default"]
+          json["override"] = current_json["override"]
+          json["automatic"] = current_json["automatic"]
           json
         end
 
@@ -76,10 +76,10 @@ class Chef
 
         def keys
           {
-            'name' => :name,
-            'chef_environment' => :chef_environment,
-            'run_list' => :run_list,
-            'normal' => :attributes
+            "name" => :name,
+            "chef_environment" => :chef_environment,
+            "run_list" => :run_list,
+            "normal" => :attributes,
           }
         end
       end

data/lib/chef/resource/chef_organization.rb

@@ -1,14 +1,14 @@
-require 'cheffish'
-require 'cheffish/base_resource'
-require 'chef/run_list/run_list_item'
-require 'chef/chef_fs/data_handler/data_handler_base'
+require "cheffish"
+require "cheffish/base_resource"
+require "chef/run_list/run_list_item"
+require "chef/chef_fs/data_handler/data_handler_base"
 
 class Chef
   class Resource
     class ChefOrganization < Cheffish::BaseResource
       resource_name :chef_organization
 
-      property :name, Cheffish::NAME_REGEX, name_property: true
+      property :organization_name, Cheffish::NAME_REGEX, name_property: true
       property :full_name, String
 
       # A list of users who must at least be invited to the org (but may already be
@@ -26,19 +26,18 @@ class Chef
       # from the org and invites will be revoked (if any).
       property :remove_members, ArrayType
 
-
       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
+            description = [ "update organization #{new_resource.organization_name} at #{rest.url}" ] + differences
             converge_by description do
-              rest.put("#{rest.root_url}/organizations/#{new_resource.name}", normalize_for_put(new_json))
+              rest.put("#{rest.root_url}/organizations/#{new_resource.organization_name}", normalize_for_put(new_json))
             end
           end
         else
-          description = [ "create organization #{new_resource.name} at #{rest.url}" ] + differences
+          description = [ "create organization #{new_resource.organization_name} at #{rest.url}" ] + differences
           converge_by description do
             rest.post("#{rest.root_url}/organizations", normalize_for_post(new_json))
           end
@@ -47,15 +46,15 @@ class Chef
         # 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]}")
+            converge_by "revoke #{user}'s invitation to organization #{new_resource.organization_name}" do
+              rest.delete("#{rest.root_url}/organizations/#{new_resource.organization_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}")
+            converge_by "remove #{user} from organization #{new_resource.organization_name}" do
+              rest.delete("#{rest.root_url}/organizations/#{new_resource.organization_name}/users/#{user}")
             end
           end
         end
@@ -63,15 +62,15 @@ class Chef
         # 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 })
+            converge_by "invite #{user} to organization #{new_resource.organization_name}" do
+              rest.post("#{rest.root_url}/organizations/#{new_resource.organization_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 })
+            converge_by "Add #{user} to organization #{new_resource.organization_name}" do
+              rest.post("#{rest.root_url}/organizations/#{new_resource.organization_name}/users/", { "username" => user })
             end
           end
         end
@@ -79,14 +78,14 @@ class Chef
 
       action_class.class_eval do
         def existing_members
-          @existing_members ||= rest.get("#{rest.root_url}/organizations/#{new_resource.name}/users").map { |u| u['user']['username'] }
+          @existing_members ||= rest.get("#{rest.root_url}/organizations/#{new_resource.organization_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']
+            rest.get("#{rest.root_url}/organizations/#{new_resource.organization_name}/association_requests").each do |r|
+              invites[r["username"]] = r["id"]
             end
             invites
           end
@@ -122,8 +121,8 @@ class Chef
 
       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}")
+          converge_by "delete organization #{new_resource.organization_name} at #{rest.url}" do
+            rest.delete("#{rest.root_url}/organizations/#{new_resource.organization_name}")
           end
         end
       end
@@ -131,7 +130,7 @@ class Chef
       action_class.class_eval do
         def load_current_resource
           begin
-            @current_resource = json_to_resource(rest.get("#{rest.root_url}/organizations/#{new_resource.name}"))
+            @current_resource = json_to_resource(rest.get("#{rest.root_url}/organizations/#{new_resource.organization_name}"))
           rescue Net::HTTPServerException => e
             if e.response.code == "404"
               @current_resource = not_found_resource
@@ -155,8 +154,8 @@ class Chef
 
         def keys
           {
-            'name' => :name,
-            'full_name' => :full_name
+            "name" => :organization_name,
+            "full_name" => :full_name,
           }
         end
 
@@ -164,11 +163,11 @@ class Chef
           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'
+              "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

data/lib/chef/resource/chef_resolved_cookbooks.rb

@@ -1,5 +1,5 @@
-require 'cheffish/base_resource'
-require 'chef_zero'
+require "cheffish/base_resource"
+require "chef_zero"
 
 class Chef
   class Resource
@@ -8,8 +8,8 @@ class Chef
 
       def initialize(*args)
         super
-        require 'berkshelf'
-        berksfile Berkshelf::Berksfile.new('/tmp/Berksfile')
+        require "berkshelf"
+        berksfile Berkshelf::Berksfile.new("/tmp/Berksfile")
         @cookbooks_from = []
       end
 
@@ -30,7 +30,7 @@ class Chef
       action :resolve do
         new_resource.cookbooks_from.each do |path|
           ::Dir.entries(path).each do |name|
-            if ::File.directory?(::File.join(path, name)) && name != '.' && name != '..'
+            if ::File.directory?(::File.join(path, name)) && name != "." && name != ".."
               new_resource.berksfile.cookbook name, :path => ::File.join(path, name)
             end
           end
@@ -45,14 +45,14 @@ class Chef
             :client_name => new_resource.chef_server[:options][:client_name],
             :client_key => new_resource.chef_server[:options][:signing_key_filename])
         else
-          file = Tempfile.new('privatekey')
+          file = Tempfile.new("privatekey")
           begin
             file.write(ChefZero::PRIVATE_KEY)
             file.close
 
             new_resource.berksfile.upload(
               :server_url => new_resource.chef_server[:chef_server_url],
-              :client_name => new_resource.chef_server[:options][:client_name] || 'me',
+              :client_name => new_resource.chef_server[:options][:client_name] || "me",
               :client_key => file.path)
 
           ensure

data/lib/chef/resource/chef_role.rb

@@ -1,14 +1,14 @@
-require 'cheffish'
-require 'cheffish/base_resource'
-require 'chef/run_list/run_list_item'
-require 'chef/chef_fs/data_handler/role_data_handler'
+require "cheffish"
+require "cheffish/base_resource"
+require "chef/run_list/run_list_item"
+require "chef/chef_fs/data_handler/role_data_handler"
 
 class Chef
   class Resource
     class ChefRole < Cheffish::BaseResource
       resource_name :chef_role
 
-      property :name, Cheffish::NAME_REGEX, name_property: true
+      property :role_name, Cheffish::NAME_REGEX, name_property: true
       property :description, String
       property :run_list, Array # We should let them specify it as a series of parameters too
       property :env_run_lists, Hash
@@ -22,7 +22,7 @@ class Chef
       # end
       # default_attribute 'ip_address', :delete
       attr_reader :default_attribute_modifiers
-      def default_attribute(attribute_path, value=NOT_PASSED, &block)
+      def default_attribute(attribute_path, value = NOT_PASSED, &block)
         @default_attribute_modifiers ||= []
         if value != NOT_PASSED
           @default_attribute_modifiers << [ attribute_path, value ]
@@ -40,7 +40,7 @@ class Chef
       # end
       # override_attribute 'ip_address', :delete
       attr_reader :override_attribute_modifiers
-      def override_attribute(attribute_path, value=NOT_PASSED, &block)
+      def override_attribute(attribute_path, value = NOT_PASSED, &block)
         @override_attribute_modifiers ||= []
         if value != NOT_PASSED
           @override_attribute_modifiers << [ attribute_path, value ]
@@ -65,6 +65,7 @@ class Chef
         @run_list_modifiers ||= []
         @run_list_modifiers += recipes.map { |recipe| Chef::RunList::RunListItem.new("recipe[#{recipe}]") }
       end
+
       def role(*roles)
         if roles.size == 0
           raise ArgumentError, "At least one role must be specified"
@@ -72,6 +73,7 @@ class Chef
         @run_list_modifiers ||= []
         @run_list_modifiers += roles.map { |role| Chef::RunList::RunListItem.new("role[#{role}]") }
       end
+
       def remove_recipe(*recipes)
         if recipes.size == 0
           raise ArgumentError, "At least one recipe must be specified"
@@ -79,6 +81,7 @@ class Chef
         @run_list_removers ||= []
         @run_list_removers += recipes.map { |recipe| Chef::RunList::RunListItem.new("recipe[#{recipe}]") }
       end
+
       def remove_role(*roles)
         if roles.size == 0
           raise ArgumentError, "At least one role must be specified"
@@ -92,13 +95,13 @@ class Chef
 
         if current_resource_exists?
           if differences.size > 0
-            description = [ "update role #{new_resource.name} at #{rest.url}" ] + differences
+            description = [ "update role #{new_resource.role_name} at #{rest.url}" ] + differences
             converge_by description do
-              rest.put("roles/#{new_resource.name}", normalize_for_put(new_json))
+              rest.put("roles/#{new_resource.role_name}", normalize_for_put(new_json))
             end
           end
         else
-          description = [ "create role #{new_resource.name} at #{rest.url}" ] + differences
+          description = [ "create role #{new_resource.role_name} at #{rest.url}" ] + differences
           converge_by description do
             rest.post("roles", normalize_for_post(new_json))
           end
@@ -107,8 +110,8 @@ class Chef
 
       action :delete do
         if current_resource_exists?
-          converge_by "delete role #{new_resource.name} at #{rest.url}" do
-            rest.delete("roles/#{new_resource.name}")
+          converge_by "delete role #{new_resource.role_name} at #{rest.url}" do
+            rest.delete("roles/#{new_resource.role_name}")
           end
         end
       end
@@ -116,7 +119,7 @@ class Chef
       action_class.class_eval do
         def load_current_resource
           begin
-            @current_resource = json_to_resource(rest.get("roles/#{new_resource.name}"))
+            @current_resource = json_to_resource(rest.get("roles/#{new_resource.role_name}"))
           rescue Net::HTTPServerException => e
             if e.response.code == "404"
               @current_resource = not_found_resource
@@ -128,9 +131,9 @@ class Chef
 
         def augment_new_json(json)
           # Apply modifiers
-          json['run_list'] = apply_run_list_modifiers(new_resource.run_list_modifiers, new_resource.run_list_removers, json['run_list'])
-          json['default_attributes'] = apply_modifiers(new_resource.default_attribute_modifiers, json['default_attributes'])
-          json['override_attributes'] = apply_modifiers(new_resource.override_attribute_modifiers, json['override_attributes'])
+          json["run_list"] = apply_run_list_modifiers(new_resource.run_list_modifiers, new_resource.run_list_removers, json["run_list"])
+          json["default_attributes"] = apply_modifiers(new_resource.default_attribute_modifiers, json["default_attributes"])
+          json["override_attributes"] = apply_modifiers(new_resource.override_attribute_modifiers, json["override_attributes"])
           json
         end
 
@@ -148,12 +151,12 @@ class Chef
 
         def keys
           {
-            'name' => :name,
-            'description' => :description,
-            'run_list' => :run_list,
-            'env_run_lists' => :env_run_lists,
-            'default_attributes' => :default_attributes,
-            'override_attributes' => :override_attributes
+            "name" => :role_name,
+            "description" => :description,
+            "run_list" => :run_list,
+            "env_run_lists" => :env_run_lists,
+            "default_attributes" => :default_attributes,
+            "override_attributes" => :override_attributes,
           }
         end
       end

data/lib/chef/resource/chef_user.rb

@@ -1,5 +1,5 @@
-require 'cheffish'
-require 'cheffish/chef_actor_base'
+require "cheffish"
+require "cheffish/chef_actor_base"
 
 class Chef
   class Resource
@@ -7,7 +7,7 @@ class Chef
       resource_name :chef_user
 
       # Client attributes
-      property :name, Cheffish::NAME_REGEX, name_property: true
+      property :user_name, Cheffish::NAME_REGEX, name_property: true
       property :display_name, String
       property :admin, Boolean
       property :email, String
@@ -37,7 +37,6 @@ class Chef
         block ? @after = block : @after
       end
 
-
       action :create do
         create_actor
       end
@@ -53,7 +52,7 @@ class Chef
         # Gives us new_json, current_json, not_found_json, etc.
 
         def actor_type
-          'user'
+          "user"
         end
 
         def actor_path
@@ -70,15 +69,15 @@ class Chef
 
         def keys
           {
-            'name' => :name,
-            'username' => :name,
-            'display_name' => :display_name,
-            'admin' => :admin,
-            'email' => :email,
-            'password' => :password,
-            'external_authentication_uid' => :external_authentication_uid,
-            'recovery_authentication_enabled' => :recovery_authentication_enabled,
-            'public_key' => :source_key
+            "name" => :user_name,
+            "username" => :user_name,
+            "display_name" => :display_name,
+            "admin" => :admin,
+            "email" => :email,
+            "password" => :password,
+            "external_authentication_uid" => :external_authentication_uid,
+            "recovery_authentication_enabled" => :recovery_authentication_enabled,
+            "public_key" => :source_key,
           }
         end
       end

data/lib/chef/resource/private_key.rb

@@ -1,7 +1,7 @@
-require 'openssl/cipher'
-require 'cheffish/base_resource'
-require 'openssl'
-require 'cheffish/key_formatter'
+require "openssl/cipher"
+require "cheffish/base_resource"
+require "openssl"
+require "cheffish/key_formatter"
 
 class Chef
   class Resource
@@ -31,7 +31,7 @@ class Chef
 
       # PEM-only
       property :pass_phrase, String
-      property :cipher, OpenSSL::Cipher.ciphers, default: 'DES-EDE3-CBC'
+      property :cipher, OpenSSL::Cipher.ciphers, default: "DES-EDE3-CBC"
 
       # Set this to regenerate the key if it does not have the desired characteristics (like size, type, etc.)
       property :regenerate_if_different, Boolean
@@ -46,7 +46,6 @@ class Chef
         Chef::Log.debug("Overloading #{resource_name}.load_prior_resource with NOOP")
       end
 
-
       action :create do
         create_key(false, :create)
       end
@@ -90,12 +89,12 @@ class Chef
             # Generate a new key
             #
             if current_resource.action == [ :delete ] || regenerate ||
-              (new_resource.regenerate_if_different &&
-                (!current_private_key ||
-                 current_resource.size != new_resource.size ||
-                 current_resource.type != new_resource.type))
+                (new_resource.regenerate_if_different &&
+                 (!current_private_key ||
+                  current_resource.size != new_resource.size ||
+                  current_resource.type != new_resource.type))
 
-             case new_resource.type
+              case new_resource.type
               when :rsa
                 if new_resource.exponent
                   final_private_key = OpenSSL::PKey::RSA.generate(new_resource.size, new_resource.exponent)
@@ -118,7 +117,7 @@ class Chef
               generated_description = " (#{new_resource.size} bits#{new_resource.pass_phrase ? ", #{new_resource.cipher} password" : ""})"
 
               if new_path != :none
-                action = current_resource.path == :none ? 'create' : 'overwrite'
+                action = current_resource.path == :none ? "create" : "overwrite"
                 converge_by "#{action} #{new_resource.type} private key #{new_path}#{generated_description}" do
                   write_private_key(final_private_key)
                 end
@@ -172,7 +171,7 @@ class Chef
         end
 
         def write_private_key(key)
-          ::File.open(new_path, 'w') do |file|
+          ::File.open(new_path, "w") do |file|
             file.chmod(0600)
             file.write(encode_private_key(key))
           end
@@ -180,18 +179,18 @@ class Chef
 
         def new_source_key
           @new_source_key ||= begin
-            if new_resource.source_key.is_a?(String)
-              source_key, source_key_format = Cheffish::KeyFormatter.decode(new_resource.source_key, new_resource.source_key_pass_phrase)
-              source_key
-            elsif new_resource.source_key
-              new_resource.source_key
-            elsif new_resource.source_key_path
-              source_key, source_key_format = Cheffish::KeyFormatter.decode(IO.read(new_resource.source_key_path), new_resource.source_key_pass_phrase, new_resource.source_key_path)
-              source_key
-            else
-              nil
-            end
-          end
+                                if new_resource.source_key.is_a?(String)
+                                  source_key, source_key_format = Cheffish::KeyFormatter.decode(new_resource.source_key, new_resource.source_key_pass_phrase)
+                                  source_key
+                                elsif new_resource.source_key
+                                  new_resource.source_key
+                                elsif new_resource.source_key_path
+                                  source_key, source_key_format = Cheffish::KeyFormatter.decode(IO.read(new_resource.source_key_path), new_resource.source_key_pass_phrase, new_resource.source_key_path)
+                                  source_key
+                                else
+                                  nil
+                                end
+                              end
         end
 
         attr_reader :current_private_key