chef-vault 2.4.0 → 2.5.0

data/lib/chef-vault/item_keys.rb

@@ -1,5 +1,5 @@
 # Author:: Kevin Moser <kevin.moser@nordstrom.com>
-# Copyright:: Copyright 2013, Nordstrom, Inc.
+# Copyright:: Copyright 2013-15, Nordstrom, Inc.
 # License:: Apache License, Version 2.0
 
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -14,117 +14,119 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-class ChefVault::ItemKeys < Chef::DataBagItem
-  def initialize(vault, name)
-    super() # parenthesis required to strip off parameters
-    @data_bag = vault
-    @raw_data["id"] = name
-    @raw_data["admins"] = []
-    @raw_data["clients"] = []
-    @raw_data["search_query"] = []
-  end
+class ChefVault
+  class ItemKeys < Chef::DataBagItem
+    def initialize(vault, name)
+      super() # parenthesis required to strip off parameters
+      @data_bag = vault
+      @raw_data["id"] = name
+      @raw_data["admins"] = []
+      @raw_data["clients"] = []
+      @raw_data["search_query"] = []
+    end
 
-  def include?(key)
-    @raw_data.keys.include?(key)
-  end
+    def include?(key)
+      @raw_data.keys.include?(key)
+    end
 
-  def add(chef_client, data_bag_shared_secret, type)
-    public_key = OpenSSL::PKey::RSA.new chef_client.public_key
-    self[chef_client.name] =
-      Base64.encode64(public_key.public_encrypt(data_bag_shared_secret))
+    def add(chef_client, data_bag_shared_secret, type)
+      public_key = OpenSSL::PKey::RSA.new chef_client.public_key
+      self[chef_client.name] =
+        Base64.encode64(public_key.public_encrypt(data_bag_shared_secret))
 
-    @raw_data[type] << chef_client.name unless @raw_data[type].include?(chef_client.name)
-    @raw_data[type]
-  end
+      @raw_data[type] << chef_client.name unless @raw_data[type].include?(chef_client.name)
+      @raw_data[type]
+    end
 
-  def delete(chef_client, type)
-    raw_data.delete(chef_client)
-    raw_data[type].delete(chef_client)
-  end
+    def delete(chef_client, type)
+      raw_data.delete(chef_client)
+      raw_data[type].delete(chef_client)
+    end
 
-  def search_query(search_query=nil)
-    if search_query
-      @raw_data["search_query"] = search_query
-    else
-      @raw_data["search_query"]
+    def search_query(search_query=nil)
+      if search_query
+        @raw_data["search_query"] = search_query
+      else
+        @raw_data["search_query"]
+      end
     end
-  end
 
-  def clients
-    @raw_data["clients"]
-  end
+    def clients
+      @raw_data["clients"]
+    end
 
-  def admins
-    @raw_data["admins"]
-  end
+    def admins
+      @raw_data["admins"]
+    end
 
-  def save(item_id=@raw_data['id'])
-    if Chef::Config[:solo]
-      data_bag_path = File.join(Chef::Config[:data_bag_path],
-                                data_bag)
-      data_bag_item_path = File.join(data_bag_path, item_id)
+    def save(item_id=@raw_data['id'])
+      if Chef::Config[:solo]
+        data_bag_path = File.join(Chef::Config[:data_bag_path],
+                                  data_bag)
+        data_bag_item_path = File.join(data_bag_path, item_id)
 
-      FileUtils.mkdir(data_bag_path) unless File.exists?(data_bag_path)
-      File.open("#{data_bag_item_path}.json",'w') do |file|
-        file.write(JSON.pretty_generate(self.raw_data))
-      end
+        FileUtils.mkdir(data_bag_path) unless File.exist?(data_bag_path)
+        File.open("#{data_bag_item_path}.json", 'w') do |file|
+          file.write(JSON.pretty_generate(raw_data))
+        end
 
-      self.raw_data
-    else
-      begin
-        chef_data_bag = Chef::DataBag.load(data_bag)
-      rescue Net::HTTPServerException => http_error
-        if http_error.response.code == "404"
-          chef_data_bag = Chef::DataBag.new
-          chef_data_bag.name data_bag
-          chef_data_bag.create
+        raw_data
+      else
+        begin
+          Chef::DataBag.load(data_bag)
+        rescue Net::HTTPServerException => http_error
+          if http_error.response.code == "404"
+            chef_data_bag = Chef::DataBag.new
+            chef_data_bag.name data_bag
+            chef_data_bag.create
+          end
         end
-      end
 
-      super
+        super
+      end
     end
-  end
 
-  def destroy
-    if Chef::Config[:solo]
-      data_bag_path = File.join(Chef::Config[:data_bag_path],
-                                data_bag)
-      data_bag_item_path = File.join(data_bag_path, @raw_data["id"])
+    def destroy
+      if Chef::Config[:solo]
+        data_bag_path = File.join(Chef::Config[:data_bag_path],
+                                  data_bag)
+        data_bag_item_path = File.join(data_bag_path, @raw_data["id"])
 
-      FileUtils.rm("#{data_bag_item_path}.json")
+        FileUtils.rm("#{data_bag_item_path}.json")
 
-      nil
-    else
-      super(data_bag, id)
+        nil
+      else
+        super(data_bag, id)
+      end
     end
-  end
 
-  def to_json(*a)
-    json = super
-    json.gsub(self.class.name, self.class.superclass.name)
-  end
+    def to_json(*a)
+      json = super
+      json.gsub(self.class.name, self.class.superclass.name)
+    end
 
-  def self.from_data_bag_item(data_bag_item)
-    item = new(data_bag_item.data_bag, data_bag_item.name)
-    item.raw_data = data_bag_item.raw_data
-    item
-  end
+    def self.from_data_bag_item(data_bag_item)
+      item = new(data_bag_item.data_bag, data_bag_item.name)
+      item.raw_data = data_bag_item.raw_data
+      item
+    end
 
-  def self.load(vault, name)
-    begin
-      data_bag_item = Chef::DataBagItem.load(vault, name)
-    rescue Net::HTTPServerException => http_error
-      if http_error.response.code == "404"
+    def self.load(vault, name)
+      begin
+        data_bag_item = Chef::DataBagItem.load(vault, name)
+      rescue Net::HTTPServerException => http_error
+        if http_error.response.code == "404"
+          raise ChefVault::Exceptions::KeysNotFound,
+                "#{vault}/#{name} could not be found"
+        else
+          raise http_error
+        end
+      rescue Chef::Exceptions::ValidationFailed
         raise ChefVault::Exceptions::KeysNotFound,
               "#{vault}/#{name} could not be found"
-      else
-        raise http_error
       end
-    rescue Chef::Exceptions::ValidationFailed
-      raise ChefVault::Exceptions::KeysNotFound,
-            "#{vault}/#{name} could not be found"
-    end
 
-    from_data_bag_item(data_bag_item)
+      from_data_bag_item(data_bag_item)
+    end
   end
 end

data/lib/chef-vault/user.rb

@@ -1,5 +1,5 @@
 # Description: ChefVault::User class
-# Copyright 2013, Nordstrom, Inc.
+# Copyright 2013-15, Nordstrom, Inc.
 
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/chef-vault/version.rb

@@ -1,5 +1,5 @@
 # Description: ChefVault VERSION file
-# Copyright 2013, Nordstrom, Inc.
+# Copyright 2013-15, Nordstrom, Inc.
 
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,6 +14,6 @@
 # limitations under the License.
 
 class ChefVault
-  VERSION = "2.4.0"
+  VERSION = "2.5.0"
   MAJOR, MINOR, TINY = VERSION.split('.')
 end

data/lib/chef/knife/decrypt.rb

@@ -1,5 +1,5 @@
 # Description: Chef-Vault Decrypt class
-# Copyright 2013, Nordstrom, Inc.
+# Copyright 2013-15, Nordstrom, Inc.
 
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -19,7 +19,6 @@ require 'chef/knife/vault_decrypt'
 class Chef
   class Knife
     class Decrypt < VaultDecrypt
-
       include Knife::VaultBase
 
       banner "knife decrypt VAULT ITEM [VALUES] (options)"

data/lib/chef/knife/encrypt_create.rb

@@ -1,5 +1,5 @@
 # Description: Chef-Vault EncryptCreate class
-# Copyright 2013, Nordstrom, Inc.
+# Copyright 2013-15, Nordstrom, Inc.
 
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -19,7 +19,6 @@ require 'chef/knife/vault_create'
 class Chef
   class Knife
     class EncryptCreate < VaultCreate
-
       include Knife::VaultBase
 
       banner "knife encrypt create VAULT ITEM VALUES (options)"

data/lib/chef/knife/encrypt_delete.rb

@@ -1,5 +1,5 @@
 # Description: Chef-Vault EncryptDelete class
-# Copyright 2013, Nordstrom, Inc.
+# Copyright 2013-15, Nordstrom, Inc.
 
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -19,7 +19,6 @@ require 'chef/knife/vault_delete'
 class Chef
   class Knife
     class EncryptDelete < VaultDelete
-
       include Knife::VaultBase
 
       banner "knife encrypt delete VAULT ITEM (options)"

data/lib/chef/knife/encrypt_remove.rb

@@ -1,5 +1,5 @@
 # Description: Chef-Vault EncryptRemove class
-# Copyright 2013, Nordstrom, Inc.
+# Copyright 2013-15, Nordstrom, Inc.
 
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -19,7 +19,6 @@ require 'chef/knife/vault_remove'
 class Chef
   class Knife
     class EncryptRemove < VaultRemove
-
       include Knife::VaultBase
 
       banner "knife encrypt remove VAULT ITEM VALUES (options)"

data/lib/chef/knife/encrypt_rotate_keys.rb

@@ -1,5 +1,5 @@
 # Description: Chef-Vault EncryptRotateKeys class
-# Copyright 2013, Nordstrom, Inc.
+# Copyright 2013-15, Nordstrom, Inc.
 
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -19,7 +19,6 @@ require 'chef/knife/vault_rotate_keys'
 class Chef
   class Knife
     class EncryptRotateKeys < VaultRotateKeys
-
       include Knife::VaultBase
 
       banner "knife encrypt rotate keys VAULT ITEM (options)"

data/lib/chef/knife/encrypt_update.rb

@@ -1,5 +1,5 @@
 # Description: Chef-Vault EncryptUpdate class
-# Copyright 2013, Nordstrom, Inc.
+# Copyright 2013-15, Nordstrom, Inc.
 
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -19,7 +19,6 @@ require 'chef/knife/vault_update'
 class Chef
   class Knife
     class EncryptUpdate < VaultUpdate
-
       include Knife::VaultBase
 
       option :search,

data/lib/chef/knife/mixin/compat.rb

@@ -13,17 +13,17 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# Make a wraper to chef10/11 "shef/shell" changes 
+# Make a wraper to chef10/11 "shef/shell" changes
 
 class ChefVault
   module Mixin
     module KnifeCompat
       require 'chef/version'
       def extend_context_object(obj)
-        if Chef::VERSION.to_i >= 11 
+        if Chef::VERSION.to_i >= 11
           require "chef/shell/ext"
           Shell::Extensions.extend_context_object(obj)
-        else 
+        else
           require 'chef/shef/ext'
           Shef::Extensions.extend_context_object(obj)
         end

data/lib/chef/knife/mixin/helper.rb

@@ -28,23 +28,21 @@ class ChefVault
         values = {}
         values.merge!(values_from_file(file)) if file
         values.merge!(values_from_json(json)) if json
-        
+
         values
       end
 
       def values_from_file(file)
-        json = File.open(file){ |file| file.read() }
+        json = File.open(file){ |fh| fh.read() }
 
         values_from_json(json)
       end
 
       def values_from_json(json)
-        begin
-          JSON.parse(json)
-        rescue JSON::ParserError
-          raise JSON::ParserError, "#{json} is not valid JSON!"
-        end
+        JSON.parse(json)
+      rescue JSON::ParserError
+        raise JSON::ParserError, "#{json} is not valid JSON!"
       end
     end
   end
-end
+end

data/lib/chef/knife/vault_admins.rb

@@ -1,5 +1,5 @@
 # Description: Chef-Vault VaultAdmins module
-# Copyright 2014, Nordstrom, Inc.
+# Copyright 2014-15, Nordstrom, Inc.
 
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -19,7 +19,6 @@ require 'chef-vault'
 class Chef
   class Knife
     module VaultAdmins
-
       private
 
       def admins

data/lib/chef/knife/vault_base.rb

@@ -1,5 +1,5 @@
 # Description: Chef-Vault VaultBase module
-# Copyright 2013, Nordstrom, Inc.
+# Copyright 2013-15, Nordstrom, Inc.
 
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -33,7 +33,7 @@ class Chef
             :short => '-M MODE',
             :long => '--mode MODE',
             :description => 'Chef mode to run in default - solo',
-            :proc => Proc.new { |i| Chef::Config[:knife][:vault_mode] = i }
+            :proc => proc { |i| Chef::Config[:knife][:vault_mode] = i }
         end
       end
 

data/lib/chef/knife/vault_create.rb

@@ -1,5 +1,5 @@
 # Description: Chef-Vault VaultCreate class
-# Copyright 2014, Nordstrom, Inc.
+# Copyright 2014-15, Nordstrom, Inc.
 
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -19,7 +19,6 @@ require 'chef/knife/vault_admins'
 class Chef
   class Knife
     class VaultCreate < Knife
-
       include Chef::Knife::VaultBase
       include Chef::Knife::VaultAdmins
 
@@ -62,7 +61,7 @@ class Chef
               "use 'knife vault remove' 'knife vault update' "\
               "or 'knife vault edit' to make changes."
           rescue ChefVault::Exceptions::KeysNotFound,
-            ChefVault::Exceptions::ItemNotFound
+                 ChefVault::Exceptions::ItemNotFound
             vault_item = ChefVault::Item.new(vault, item)
 
             if values || json_file || file
@@ -75,7 +74,7 @@ class Chef
                 vault_item["file-content"] = File.open(file) { |f| f.read() }
               end
             else
-              vault_json = edit_data(Hash.new)
+              vault_json = edit_data({})
               vault_json.each do |key, value|
                 vault_item[key] = value
               end

data/lib/chef/knife/vault_decrypt.rb

@@ -1,5 +1,5 @@
 # Description: Chef-Vault VaultDecrypt class
-# Copyright 2013, Nordstrom, Inc.
+# Copyright 2013-15, Nordstrom, Inc.
 
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -18,7 +18,6 @@ require 'chef/knife/vault_base'
 class Chef
   class Knife
     class VaultDecrypt < Knife
-
       include Chef::Knife::VaultBase
 
       banner "knife vault decrypt VAULT ITEM [VALUES] (options)"
@@ -42,14 +41,14 @@ class Chef
         vault_item = ChefVault::Item.load(vault, item).raw_data
 
         if values
-          included_values = %W( id )
+          included_values = %w(id)
 
           values.split(",").each do |value|
             value.strip! # remove white space
             included_values << value
           end
 
-          output(Hash[vault_item.find_all{|k,v| included_values.include?(k)}])
+          output(Hash[vault_item.find_all{|k, _| included_values.include?(k)}])
         else
           output(vault_item)
         end