knife-uploader 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9b8050ef45eceb21b8049370ba24887d3056248e
-  data.tar.gz: d8afb0a1f9877db327cde109cae99e691534978b
+  metadata.gz: 9452d3030cdae4e954ee4cfc33094518e50093a1
+  data.tar.gz: 80de6100bd3330cb7d3cd1cd221a702642b73b0a
 SHA512:
-  metadata.gz: 95abe2119b63365748239b162a4e468abb99c4a1ba92acb92a6b0abf450aa8dfd46e9c722c2287fee8c5044c969af8517860802ea32ebd42e9194eafbd61e15d
-  data.tar.gz: 3ec10433a22fe6b03076f2c5dfed1c66caada73e6c08b66c8b57a8acf2f597b446a38d371e2a7236234e887d15dacafe6c46e614b5661c64e33498ac02b7b053
+  metadata.gz: f497f7e4001d96aff8819227ca48bce8b9b069a97b4e85656eb9e2f63953807c6d4d2f1602f5e15e1883c8ee744115e9ee732463bf7862b2eba29ee89c57dc82
+  data.tar.gz: 0ab68bb9df7917fb2a4e6abf5ca8aa8918616559789b28740e7211ac09cc7827e5c1aac6d39a6291039f9551a6dad6e091c3dbc83c49f92dec216c6082a59d03

data/lib/chef/knife/uploader_base.rb

@@ -195,9 +195,11 @@ module KnifeUploader
         raise "File #{knife_conf_path} does not exist" unless File.file?(knife_conf_path)
 
         @ridley = Ridley.from_chef_config(knife_conf_path, :ssl => { :verify => false })
-        data_bag_secret_file_path = @ridley.options[:encrypted_data_bag_secret]
+        data_bag_secret_file_path =
+          config[:secret_file] || @ridley.options[:encrypted_data_bag_secret]
         unless data_bag_secret_file_path
-          raise "No encrypted data bag secret location specified in #{knife_conf_path}"
+          raise "No encrypted data bag secret location specified on the command line using " \
+                "--secret-file or with encrypted_data_bag_secret in #{knife_conf_path}"
         end
 
         unless File.file?(data_bag_secret_file_path)

data/lib/chef/knife/uploader_data_bag.rb

@@ -220,6 +220,11 @@ module KnifeUploader
 
     include BaseCommandMixin
 
+    # TODO: can this be moved to a module shared between data bag upload and diff commands?
+    option :secret_file,
+      long: "--secret-file SECRET_FILE",
+      description: 'A file containing the secret key to use to encrypt data bag item values'
+
     banner 'knife uploader data bag diff BAG [BAG2]'
 
     def diff_data_bag_item_files(bag_name1, bag_name2)
@@ -292,6 +297,11 @@ module KnifeUploader
   class UploaderDataBagUpload < UploaderDataBagCommand
     include BaseCommandMixin
 
+    # TODO: can this be moved to a module shared between data bag upload and diff commands?
+    option :secret_file,
+      long: "--secret-file SECRET_FILE",
+      description: 'A file containing the secret key to use to encrypt data bag item values'
+
     banner 'knife uploader data bag upload BAG'
 
     def run_internal

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: knife-uploader
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Mikhail Bautin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-27 00:00:00.000000000 Z
+date: 2015-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
@@ -155,7 +155,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Knife plugin for better uploading of data bags and run lists to Chef Server