hamburgerstore 0.1.1 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 899ded14649bddc487276a4796b94e7b64b2cd30
-  data.tar.gz: 831bfb549ce52b37b73cea3b48240bae24907960
+  metadata.gz: 970ec2d1d03637ef0a3e1f82b3a55fe0981d6357
+  data.tar.gz: 5921782e5db9df5d3b623680c2b6af1808ad82e7
 SHA512:
-  metadata.gz: 5df86d408943e77a920c6155b45272d7bc14a2be16ac28e9b1972ab128799051b0f5db73d3006bf756e75b15c8b6fdebb3c9e498081dc1bd05f390d70f05def7
-  data.tar.gz: f34609fce1257b8f60d73c8423bb1bfe8209ef3558a5d012b348ba3a63e90b133fc08550fe5a3d75836958adeb754ba9600f04b542429a440914d5f33d12d4df
+  metadata.gz: 66a0e5df33291ef61ad5287534b844f779883114c7d63dcbcfd3d8cc469d6f07e9c28969d9605753ce6e5895832f6d45ba36219298019ec4c2cc2bf6c2bbfea3
+  data.tar.gz: 085526d46b2de869b5d35d1de9249799ac7d224c714727dfbb7bb677f146d77a565f90caa3d57e0a287c0e9f852702a11ffdd2be3d9cc398fdd8a11167ae678e

data/bin/hamburgerstore.rb

@@ -36,16 +36,27 @@ cmd_opts =
       opt :table, 'the name of the table to perform the lookup on', required: true, type: String
     end
   else
-    Trollop.die "usage: hamburgerstore.rb [store|retrieve] [parameters]"
+    Trollop.die 'usage: hamburgerstore.rb [store|retrieve] [parameters]'
   end
 
 hamburger = HamburgerStore.new(table_name: cmd_opts[:table], key_id: cmd_opts[:kmsid], region: global_opts[:region])
 
 case cmd
 when 'store'
-  hamburger.store(cmd_opts[:identifier], cmd_opts[:keyname], cmd_opts[:value])
+  begin
+    hamburger.store(cmd_opts[:identifier], cmd_opts[:keyname], cmd_opts[:value])
+  rescue Exception => e
+    puts "#{e.class.name}: #{e.message}"
+    exit 1
+  end
 when 'retrieve'
-  result = hamburger.retrieve(cmd_opts[:identifier], cmd_opts[:keyname])
+  begin
+    result = hamburger.retrieve(cmd_opts[:identifier], cmd_opts[:keyname])
+  rescue Exception => e
+    msg = "Failed to retrieve value for key #{cmd_opts[:keyname]} and hamburger #{cmd_opts[:identifier]}"
+    puts "#{e.class.name}: #{msg}"
+    exit 1
+  end
   puts result
 else
   fail "unknown subcommand #{cmd}"

data/lib/hamburgerstore.rb

@@ -4,13 +4,15 @@ require 'base64'
 # Data store for pipeline instance metadata. Nothing to do with hamburgers. Sorry.
 class HamburgerStore
   def encrypt(value)
+    value = ' ' if value.length < 1
     encrypted_value = @kms.encrypt(key_id: @key_id, plaintext: value).ciphertext_blob
     Base64.encode64(encrypted_value)
   end
 
   def decrypt(value)
+    fail HamburgerKeyNotFoundInItemError, 'The key' if value.nil?
     encrypted_value = Base64.decode64(value)
-    @kms.decrypt(ciphertext_blob: encrypted_value).plaintext
+    @kms.decrypt(ciphertext_blob: encrypted_value).plaintext.strip
   end
 
   def check_kms(options)
@@ -49,14 +51,29 @@ class HamburgerStore
     @table.put_item(item: item, return_values: :ALL_OLD)
   end
 
-  def retrieve(identifier, key)
+  def ddb_get_item(identifier)
     item = @table.get_item(key: { 'hamburger' => identifier }).item
-    fail "no values for #{identifier}" if item.nil?
+    if item.nil?
+      fail HamburgerNoItemInTableError, "No values for '#{identifier}' found in table."
+    end
+    item
+  end
+
+  def retrieve(identifier, key)
+    error = nil
+    begin
+      item = ddb_get_item(identifier)
+    rescue Exception => e
+      error = e
+    end
+    if !error.nil? || item.nil? || item[key].nil?
+      fail HamburgerKeyNotFoundInItemError, "The key '#{key}' was not found in '#{identifier}' hamburger store."
+    end
     decrypt(item[key])
   end
 
   def retrieve_all(identifier)
-    encrypted_items = @table.get_item(key: { 'hamburger' => identifier }).item
+    encrypted_items = ddb_get_item(identifier)
     hamburger = encrypted_items.delete('hamburger')
     result = { 'hamburger' => hamburger }
     encrypted_items.each_pair do |key, value|
@@ -66,4 +83,14 @@ class HamburgerStore
   end
 end
 
+# Top level exception so we can catch our exceptions explicitly
+class HamburgerException < Exception
+end
+
+class HamburgerNoItemInTableError < HamburgerException
+end
+
+class HamburgerKeyNotFoundInItemError < HamburgerException
+end
+
 # store a set of parameters (?)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hamburgerstore
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.3
 platform: ruby
 authors:
 - Jonny Sywulak
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-29 00:00:00.000000000 Z
+date: 2015-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -68,7 +68,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.2.1
+      version: 2.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="