secure_data_bag 2.1.2 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b3fa2bcb163807c1cd3ded495102d5711ec22383
-  data.tar.gz: acc0b6a7480657ff56fa24811f8f4d85c83e0907
+  metadata.gz: 1a9feeb1dfc414c24ff0245dd5942cef163e5d4c
+  data.tar.gz: 89258e6b058db11c62d7dbd39af9eba58eef2700
 SHA512:
-  metadata.gz: ef0d7f6f356e4ad37ea91944e61cb92fe7c5a05d48f44f8cb13b01d25f45ba8366bba272b2f2929afdff13a05543fbd413163adbf68eab70d62cace0927a4757
-  data.tar.gz: 60385f682a64fec2e073309a6a1dcdda0db06ba5eefdd73a46e1be23f0d7a9a6fc6ce3fa43f5d5859bf66e0243c8bdaca18ad755e64290f28884a9a817211ea3
+  metadata.gz: 0d2aceb5f872a953842a29d00351bd2474696925dad5dda15bf6b09844b09652196f8fcb9e0c8e79f2ec5cb4e07aac152a48813eac87edce6ffea53983995465
+  data.tar.gz: d07e7e41cad38f400f64a84892ee03b089a49c88328c812d73433a5d711b067b533de271ae06ffa389db96c4f777f1c8bc72bc68069ee42f76c8a874088c2516

data/lib/chef/dsl/data_query.rb

@@ -1,31 +1,4 @@
 
-class Chef
-  module DSL
-    module SecureDataBag
-      def secure_data_bag_item(bag, item, cache: false)
-        data_bag_item = begin
-          node.run_state[:secure_data_bag] ||= {}
-          node.run_state[:secure_data_bag][bag] ||= {}
-          node.run_state[:secure_data_bag][bag][item]
-        end if cache
-
-        data_bag_item ||= begin
-          DataBag.validate_name!(bag.to_s)
-          ::SecureDataBag::Item.validate_id!(item)
-          ::SecureDataBag::Item.load(bag, item)
-        rescue Exception
-          Log.error("Failed to load secure data bag item: #{bag.inspect} #{item.inspect}")
-          raise
-        end
-      end
-
-      def secure_data_bag_item!(item, fields=[])
-        secure = ::SecureDataBag::Item.from_item item
-        secure.encoded_fields.concat(Array(fields))
-        secure
-      end
-    end
-  end
-end
-
+require "chef/dsl/data_query"
+Chef::DSL::DataQuery.send(:include, SecureDataBag::DSL::DataQuery)
 

data/lib/chef/knife/secure_bag_edit.rb

@@ -11,23 +11,48 @@ class Chef
       category "secure bag"
 
       def load_item(bag, item_name)
-        item = Chef::DataBagItem.load(bag, item_name)
-        @raw_data = item.to_hash
-
-        item = SecureDataBag::Item.from_item(item)
+        item = SecureDataBag::Item.load(bag, item_name)
         hash = item.to_hash(encoded: false)
         hash["_encoded_fields"] = item.encoded_fields
         hash
       end
 
-      def edit_data(data, *args)
-        output = super
-        output = data_for_save(output)
-
-        item = SecureDataBag::Item.from_hash(output)
-        item.encoded_fields item.delete("_encoded_fields")
-        raise Exception.new item.encoded_fields
-        item.to_hash encoded:true
+      def run
+        if @name_args.length != 2
+          stdout.puts "You must supply the data bag and an item to edit!"
+          stdout.puts opt_parser
+          exit 1
+        end
+
+        # Load the SecureBagItem, EncryptedDataBagItem or DataBagItem
+        item = load_item(@name_args[0], @name_args[1])
+
+        # Allow the user to modify the content
+        edited_item = edit_hash(item)
+
+        # Fetch the fields that are to be encoded
+        fields_to_encode = edited_item.delete("_encoded_fields")
+        if fields_to_encode and not fields_to_encode.empty?
+          ui.info("Saving with secure fields: #{fields_to_encode.join(", ")}")
+        else
+          ui.info("Saving without any secure fields")
+        end
+
+        # Generate a new SecureBagItem
+        item_to_save = SecureDataBag::Item.new(
+          data: edited_item,
+          fields: fields_to_encode
+        )
+        item_to_save.data_bag @name_args[0] # Set data_bag to match initial
+        item_to_save["id"] = @name_args[1]     # Ensure id was not changed
+        item_to_save.save
+
+        stdout.puts("Saved data_bag_item[#{@name_args[1]}]")
+
+        if config[:print_after]
+          data_to_print = item_to_save.to_hash(encoded: true)
+          ui.output(Chef::JSONCompat.to_json_pretty(data_to_print))
+        end
       end
     end
   end

data/lib/chef/knife/secure_bag_show.rb

@@ -17,11 +17,12 @@ class Chef
         default: false
 
       def load_item(bag, item_name)
-        item = SecureDataBag::Item.load bag, item_name, 
+        item = SecureDataBag::Item.load(bag, item_name, 
           key: read_secret,
           fields: encoded_fields
+        )
 
-        data = item.to_hash
+        data = item.to_hash(encoded: config[:encoded])
         data["_encoded_fields"] = item.encoded_fields
         data
       end

data/lib/secure_data_bag.rb

@@ -1,8 +1,8 @@
 
-require_relative "chef/config"
-require_relative "chef/dsl/data_query"
 require "secure_data_bag/version"
-require "secure_data_bag/secure_data_bag_item"
+require "secure_data_bag/item"
+require "secure_data_bag/dsl/data_query"
 
-Chef::Recipe.send(:include, Chef::DSL::SecureDataBag)
+require_relative "chef/config"
+require_relative "chef/dsl/data_query"
 

data/lib/secure_data_bag/dsl/data_query.rb

@@ -0,0 +1,31 @@
+
+module SecureDataBag
+  module DSL
+    module DataQuery
+      def secure_data_bag_item(bag, item, cache: false)
+        data_bag_item = begin
+          node.run_state[:secure_data_bag] ||= {}
+          node.run_state[:secure_data_bag][bag] ||= {}
+          node.run_state[:secure_data_bag][bag][item]
+        end if cache
+
+        data_bag_item ||= begin
+          Chef::DataBag.validate_name!(bag.to_s)
+          SecureDataBag::Item.validate_id!(item)
+          SecureDataBag::Item.load(bag, item)
+        rescue Exception
+          Chef::Log.error("Failed to load secure data bag item: #{bag.inspect} #{item.inspect}")
+          raise
+        end
+      end
+
+      def secure_data_bag_item!(item, fields=[])
+        secure = SecureDataBag::Item.from_item item
+        secure.encoded_fields.concat(Array(fields))
+        secure
+      end
+    end
+  end
+end
+
+

data/lib/secure_data_bag/{secure_data_bag_item.rb → item.rb}

@@ -107,7 +107,7 @@ module SecureDataBag
     def decode_hash(hash)
       hash.each do |k,v|
         v = if encoded_value?(v)
-              encoded_fields encoded_fields << k
+              encoded_fields(encoded_fields + [k])
               decode_value(v)
             elsif v.is_a?(Hash)
               decode_hash(v)

data/lib/secure_data_bag/version.rb

@@ -1,5 +1,5 @@
 
 module SecureDataBag
-  VERSION = "2.1.2"
+  VERSION = "2.2.0"
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: secure_data_bag
 version: !ruby/object:Gem::Version
-  version: 2.1.2
+  version: 2.2.0
 platform: ruby
 authors:
 - Jonathan Serafini
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-01 00:00:00.000000000 Z
+date: 2016-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
@@ -87,7 +87,8 @@ files:
 - lib/chef/knife/secure_bag_from_file.rb
 - lib/chef/knife/secure_bag_show.rb
 - lib/secure_data_bag.rb
-- lib/secure_data_bag/secure_data_bag_item.rb
+- lib/secure_data_bag/dsl/data_query.rb
+- lib/secure_data_bag/item.rb
 - lib/secure_data_bag/version.rb
 - secure_data_bag.gemspec
 - spec/item_spec.rb
@@ -112,11 +113,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Per-field data bag item encryption
 test_files:
 - spec/item_spec.rb
 - spec/spec_helper.rb
-has_rdoc: