vault-update 1.0.2 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 64568df3de6bce221ef106e106b16122acaa532b
-  data.tar.gz: 232e7b2384632d90d9d84e500214e4023dc864fa
+  metadata.gz: 9ccd334da99fc683a7240d10e6e828209b7fc611
+  data.tar.gz: 6efab5c807c8a7cc3a741aca87bd9d31c3953269
 SHA512:
-  metadata.gz: 96ad1c2b7b6091ccc4ac8d662198bd724d47f4e19b6589330b7cf2a33945690349ae74db74c62e1bfbc606e09ad765532a2d6c07f18d37a856a74cdbe48b39a2
-  data.tar.gz: cbd564b8111d938cfb0f7bf445f45db1b2e332e2f249dcb9173bd8e302ab3e2276ebbfebf6a839f593b9cafd82fd8161362f6c52019898786c4602ef74b7edaf
+  metadata.gz: 6742da546734bd27b853dca3b3633993728af7300693fa2a8ec866ea65ce8d210fe93e6cd0aa896e290fe2bb4afc2fb8f21ba31aaf4d45116b69d1d5d97fc07a
+  data.tar.gz: 34063b2d3cd89f86a7968fc313df591e27ece38d0cc80b8bfad192e3c895b772d2a085dd1cab37f5ede0c6bebdd16052243b839bdcab723406573a6a4364ac88

data/lib/vault-update/version.rb

@@ -1,3 +1,3 @@
 class VaultUpdate
-  VERSION = '1.0.2'.freeze
+  VERSION = '1.1.0'.freeze
 end

data/lib/vault-update.rb

@@ -3,24 +3,29 @@ require 'vault'
 require 'trollop'
 require 'json'
 require 'diffy'
+require 'colorize'
+require 'facets'
 
 class MissingInputError < StandardError; end
 class NoHistoryError < StandardError; end
 class NoUpdateError < StandardError; end
+class NoValueError < StandardError; end
 
 class VaultUpdate
   def run
     if opts[:history]
       secret_history.sort_by { |ts, _data| ts }[-history_fetch_size..-1].each do |ts, data|
-        puts "#{Time.at(ts.to_s.to_i)}:"
+        puts "#{Time.at(ts.to_s.to_i)}:".colorize(:green)
         puts JSON.pretty_generate(data) + "\n\n"
       end
     elsif opts[:last]
-      puts JSON.pretty_generate(secret_history.sort_by { |ts, _data| ts }.last[1])
+      puts JSON.pretty_generate(
+        (secret_history.sort_by { |ts, _data| ts }.last || fail(NoHistoryError))[1]
+      )
     elsif opts[:rollback]
       rollback_secret
     elsif opts[:current]
-      puts JSON.pretty_generate(vault_read(opts[:path]))
+      puts JSON.pretty_generate(vault_read(opts[:path]) || fail(NoValueError))
     else
       update
     end
@@ -28,36 +33,41 @@ class VaultUpdate
     raise e unless e.class == TypeError && e.message == 'no implicit conversion of nil into String'
     Trollop.die 'KEY and VALUE must be provided'
   rescue NoUpdateError
-    puts 'Nothing to do'
+    puts 'Nothing to do'.colorize(:light_white)
     exit 0
   rescue NoHistoryError
-    puts "ERROR: There is no history for #{opts[:path]}"
+    puts 'ERROR: '.colorize(:red) + "There is no history for #{opts[:path]}"
     exit 2
+  rescue NoValueError
+    puts 'ERROR: '.colorize(:red) + "There is no current value for #{opts[:path]}"
+    exit 3
   end
 
   private
 
   def history_fetch_size
-    opts[:history] > secret_history.count ? secret_history.count : opts[:history]
+    opts[:history] > secret_history.keys.count ? secret_history.keys.count : opts[:history]
   end
 
   def update
     update_value = ARGV.pop
 
+    json_value = true
+
     # JSON is optional in the value field, so we have this funny business
     update_value = (
       begin
         JSON.parse update_value
       rescue JSON::ParserError
+        json_value = false
         update_value
       end
     )
 
     update_key = ARGV.pop
 
-    raise(MissingInputError) unless update_key && update_value
-
-    update_secret update_key.to_sym => update_value
+    raise(MissingInputError) unless json_value || update_key
+    update_secret(json_value ? update_value : { update_key.to_sym => update_value })
   end
 
   def debug?
@@ -65,35 +75,36 @@ class VaultUpdate
   end
 
   def rollback_secret
-    raise NoHistoryError unless previous_update
+    fail NoHistoryError unless previous_update
     current_secret_value = vault_read opts[:path]
 
     # Update history with {} if empty now
     secret_history[Time.now.to_i] = (current_secret_value || {})
     vault_write "#{opts[:path]}_history", secret_history
 
-    puts "Writing to #{opts[:path]}:\n#{previous_update.to_json}" unless debug?
+    puts "Writing to #{opts[:path]}:\n".bold + JSON.pretty_generate(previous_update) unless debug?
     vault_write opts[:path], previous_update
   end
 
   def update_secret(update_hash)
     data =
-      if (current_secret_value = vault_read opts[:path])
+      if (current_secret_value = vault_read(opts[:path]).stringify_keys)
         secret_history[Time.now.to_i] = current_secret_value
         vault_write "#{opts[:path]}_history", secret_history
-        current_secret_value.merge(update_hash)
+        current_secret_value.merge(update_hash.stringify_keys)
       else
+        puts "update_hash: ".colorize(:blue) + update_hash.inspect
         update_hash
       end
 
     if debug?
-      puts "current_secret_value: #{current_secret_value}"
-      puts "update_hash: #{update_hash}"
+      puts "current_secret_value: ".colorize(:blue) + current_secret_value.inspect
+      puts "data: ".colorize(:blue) + data.inspect
     end
 
-    raise NoUpdateError if current_secret_value == data
+    fail NoUpdateError if current_secret_value == data
 
-    puts "Applying changes to #{opts[:path]}:\n\n"
+    puts "Applying changes to #{opts[:path]}:\n".bold
     puts Diffy::Diff.new(
       JSON.pretty_generate(current_secret_value) + "\n", # What to do if no existing content
       JSON.pretty_generate(data) + "\n"
@@ -134,13 +145,13 @@ class VaultUpdate
         opt :last, 'Show the last value', short: 'l'
         opt :current, 'Show the current contents of the secret', short: 'c'
       end
-      raise 'VAULT_ADDR and VAULT_TOKEN must be set' unless ENV['VAULT_ADDR'] && ENV['VAULT_TOKEN']
+      fail 'VAULT_ADDR and VAULT_TOKEN must be set' unless ENV['VAULT_ADDR'] && ENV['VAULT_TOKEN']
       opts
     end
   end
 
   def vault_write(path, data)
-    puts "Writing to #{path}:\n#{data.inspect}" if debug?
+    puts "Writing to #{path}:\n".colorize(:blue) + data.inspect if debug?
     vault.with_retries(Vault::HTTPConnectionError) do |attempt, e|
       puts "Received exception #{e} from Vault - attempt #{attempt}" if e
       vault.logical.write(path, data)
@@ -153,7 +164,7 @@ class VaultUpdate
       vault.logical.read(path)
     end
     res = r ? r.data : nil
-    puts "Read from #{path}:\n#{res.to_json}" if debug?
+    puts "Read from #{path}:\n".colorize(:blue) + res.to_json if debug?
     res
   end
 

data/vault-update.gemspec

@@ -24,6 +24,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'diffy'
   spec.add_dependency 'trollop'
   spec.add_dependency 'vault'
+  spec.add_dependency 'colorize'
 
   spec.add_development_dependency 'bundler', '~> 1.13'
   spec.add_development_dependency 'rake', '~> 10.0'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vault-update
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.1.0
 platform: ruby
 authors:
 - Eric Herot
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-10-27 00:00:00.000000000 Z
+date: 2016-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: diffy
@@ -52,6 +52,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: colorize
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement