knife-solo_data_bag 0.1.0 → 0.2.0

data/CHANGELOG.md

@@ -1,2 +1,8 @@
 ## head
 
+## 0.2.0 (07/01/2012)
+* Add support for specifying JSON content on the command line (props to BK Box)
+
+## 0.1.0 (05/17/2012)
+* Initial release
+

data/README.md

@@ -20,6 +20,10 @@ Create an encrypted data bag with the provided file content as the secret
 
     $ knife solo data bag create apps app_1 --secret-file 'SECRET_FILE'
 
+Create a data bag item with JSON from the command line (works with encryption)
+
+    $ knife solo data bag create apps app_1 --json '{"id": "app_1", "username": "bob"}'
+
 ### Edit
 Edit a plain text data bag
 

data/lib/chef/knife/helpers.rb

@@ -1,6 +1,8 @@
 module KnifeSoloDataBag
   module Helpers
 
+    require 'json'
+
     def bag_item_path
       File.expand_path File.join(bag_path, "#{item_name}.json")
     end
@@ -22,6 +24,10 @@ module KnifeSoloDataBag
       config[:secret] || config[:secret_file]
     end
 
+    def convert_json_string
+      JSON.parse config[:json_string]
+    end
+
     def validate_bag_name_provided
       unless bag_name
         show_usage
@@ -37,6 +43,14 @@ module KnifeSoloDataBag
       end
     end
 
+    def validate_json_string
+      begin
+        JSON.parse config[:json_string], :create_additions => false
+      rescue => error
+        raise "Syntax error in #{config[:json_string]}: #{error.message}"
+      end
+    end
+
     def validate_multiple_secrets_were_not_provided
       if config[:secret] && config[:secret_file]
         show_usage

data/lib/chef/knife/solo_data_bag_create.rb

@@ -21,6 +21,11 @@ module KnifeSoloDataBag
            :long  => '--secret-file SECRET_FILE',
            :description => 'A file containing the secret key to use to encrypt data bag item values'
 
+    option :json_string,
+           :short => '-j JSON_STRING',
+           :long  => '--json JSON_STRING',
+           :description => 'The data bag json string that can be passed at the CLI'
+
     def run
       @bag_name, @item_name = @name_args
       ensure_valid_arguments
@@ -38,18 +43,27 @@ module KnifeSoloDataBag
       FileUtils.mkdir_p bag_path unless File.exists? bag_path
     end
 
-    def create_bag_item
-      create_object({'id' => item_name}, "data_bag_item[#{item_name}]") do |output|
-        item = Chef::DataBagItem.from_hash bag_item_content(output)
-        item.data_bag bag_name
-        persist_bag_item item
+    def create_item_object
+      if config[:json_string].nil?
+        create_object({'id' => item_name}, "data_bag_item[#{item_name}]") do |output|
+          item = Chef::DataBagItem.from_hash bag_item_content(output)
+        end
+      else
+        item = Chef::DataBagItem.from_hash bag_item_content(convert_json_string)
       end
     end
 
+    def create_bag_item
+      item = create_item_object
+      item.data_bag bag_name
+      persist_bag_item item
+    end
+
     def ensure_valid_arguments
       validate_bag_name_provided
       validate_bags_path_exists
       validate_multiple_secrets_were_not_provided
+      validate_json_string unless config[:json_string].nil?
     end
 
     def persist_bag_item(item)

data/lib/knife-solo_data_bag/version.rb

@@ -1,5 +1,5 @@
 module Knife
   module SoloDataBag
-    VERSION = '0.1.0'
+    VERSION = '0.2.0'
   end
 end

data/spec/unit/solo_data_bag_create_spec.rb

@@ -87,6 +87,57 @@ describe KnifeSoloDataBag::SoloDataBagCreate do
 
       end
 
+      context 'when also specifying a json string' do
+        before do
+          @knife.name_args << 'bar'
+          @knife.config[:json_string] = '{"id": "foo", "sub": {"key_1": "value_1", "key_2": "value_2"}}'
+          @input_data = {'id' => 'foo', 'sub' => {'key_1' => 'value_1', 'key_2' => 'value_2'}}
+          @item_path = "#{@bag_path}/bar.json"
+        end
+
+        it 'should create the data bag item' do
+          @knife.run
+          JSON.parse(File.read(@item_path)).raw_data.should == @input_data
+        end
+
+        context 'when encrypting with -s or --secret' do
+          before do
+            @knife.name_args << 'bar'
+            @knife.config[:secret] = 'secret_key'
+          end
+
+          it 'should create the encrypted data bag item' do
+            @knife.run
+            content = JSON.parse(File.read(@item_path)).raw_data
+            @input_data.keys.reject{|i| i == 'id'}.each do |k|
+              content.should have_key k
+              content[k].should_not == @input_data[k]
+            end
+          end
+        end
+
+        context 'when encrypting with --secret-file' do
+          before do
+            @knife.name_args            << 'bar'
+            @secret_path                = '/var/chef/secret.txt'
+            @knife.config[:secret_file] = @secret_path
+            Chef::EncryptedDataBagItem.should_receive(:load_secret).
+                                       with(@secret_path).
+                                       and_return('psst')
+          end
+
+          it 'should create the encrypted data bag item' do
+            @knife.run
+            content = JSON.parse(File.read(@item_path)).raw_data
+            @input_data.keys.reject{|i| i == 'id'}.each do |k|
+              content.should have_key k
+              content[k].should_not == @input_data[k]
+            end
+          end
+        end
+
+      end
+
     end
 
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knife-solo_data_bag
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-17 00:00:00.000000000Z
+date: 2012-07-01 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
-  requirement: &70125975538240 !ruby/object:Gem::Requirement
+  requirement: &70100793125240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 0.10.10
   type: :development
   prerelease: false
-  version_requirements: *70125975538240
+  version_requirements: *70100793125240
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70125975537740 !ruby/object:Gem::Requirement
+  requirement: &70100793124740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 2.10.0
   type: :development
   prerelease: false
-  version_requirements: *70125975537740
+  version_requirements: *70100793124740
 - !ruby/object:Gem::Dependency
   name: fakefs
-  requirement: &70125975537280 !ruby/object:Gem::Requirement
+  requirement: &70100793124280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,7 +43,7 @@ dependencies:
         version: 0.4.0
   type: :development
   prerelease: false
-  version_requirements: *70125975537280
+  version_requirements: *70100793124280
 description: A knife plugin for working with data bags and chef solo
 email:
 - bishop.thomas@gmail.com