rcredstash 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: aca06718657a698ddb0fd0656439042e474170b0
-  data.tar.gz: 324fe21131421305b45470106bacc13babfff0b6
+SHA256:
+  metadata.gz: 67d409c186f9c7006ef72dca4f1f60aa350fb868dfd1057c98be393d8f2c37cb
+  data.tar.gz: 0af15c57f304ae9ad1227b3a014f3f966880b7b688d749fb26dcf858153794c0
 SHA512:
-  metadata.gz: 4b427dc9e94c13ce80316d8dad17defec8a4afb5fcfe64f4903d99b4d997135e868158b36f79b586f0be8dc4671cd29b350749ed9bb51f8a55efbc596de0bcae
-  data.tar.gz: cfa18c4db3718522d563e3f28d2ed239f7949a7c312f9bd4772c94a81394aeffd5dc93431d401a1366cb3ffd05b8317c49aa444147b4d41df221233dc2e1edc6
+  metadata.gz: 0a54e33b123c10b28858e73705a6dafe3fca7e47f7c74d74c171cf5ae49763ebddd620c2ac550b095bd08bdcc7938bdf68940c7e3e1eb34b4398dcc233b889b9
+  data.tar.gz: 89a073eaa083fa4b000d422a9b9887c23ceffc5b1a7ba59662633f482597e896bcd28d25b5f7cc4429c011955ac4eea095055bb75516977f1c3be5e8c1d26027

data/lib/cred_stash/cli.rb

@@ -3,8 +3,9 @@ require 'thor'
 module CredStash
   class CLI < Thor
     desc "get [key name]", "Show a value for key name"
+    option :version, type: :string, aliases: '-v', desc: 'Show a value for key name with their versions'
     def get(name)
-      puts CredStash.get(name)
+      puts CredStash.get(name, version: options[:version])
     end
 
     desc "put [key name]", "Put a value for key name"
@@ -17,13 +18,21 @@ module CredStash
     end
 
     desc "list", "Show all stored keys"
-    def list
-      puts CredStash.list.keys
+    option :version, type: :boolean, aliases: '-v', desc: 'Show all stored keys with their versions'
+    def list()
+      if options[:version]
+        CredStash.list_with_version.each do |hash|
+          puts "#{hash["name"]} --version: #{hash["version"]}"
+        end
+      else
+        puts CredStash.list.keys
+      end
     end
 
     desc "delete [key name]", "Delete a key"
+    option :version, type: :string, aliases: '-v', desc: 'Specify version'
     def delete(name)
-      CredStash.delete(name)
+      CredStash.delete(name, version: options[:version])
       puts "#{name} has deleted."
     end
 

data/lib/cred_stash/repository/dynamo_db.rb

@@ -4,31 +4,20 @@ module CredStash::Repository
       @client = client || Aws::DynamoDB::Client.new
     end
 
-    def get(name)
-      select(name, limit: 1).first.tap do |item|
+    def get(name, version: nil)
+      select(name, limit: 1, version: version).first.tap do |item|
         unless item
-          raise CredStash::ItemNotFound, "#{name} is not found"
+          if version
+            raise CredStash::ItemNotFound, "#{name} --version: #{version} is not found"
+          else
+            raise CredStash::ItemNotFound, "#{name} is not found"
+          end
         end
       end
     end
 
-    def select(name, pluck: nil, limit: nil)
-      params = {
-        table_name: CredStash.config.table_name,
-        consistent_read: true,
-        key_condition_expression: "#name = :name",
-        expression_attribute_names: { "#name" => "name"},
-        expression_attribute_values: { ":name" => name }
-      }
-
-      if pluck
-        params[:projection_expression] = pluck
-      end
-
-      if limit
-        params[:limit] = limit
-        params[:scan_index_forward] = false
-      end
+    def select(name, pluck: nil, limit: nil, version: nil)
+      params = set_params(name, pluck: pluck, limit: limit, version: version)
 
       @client.query(params).items.map do |item|
         Item.new(
@@ -56,11 +45,7 @@ module CredStash::Repository
     end
 
     def list
-      @client.scan(
-        table_name: CredStash.config.table_name,
-        projection_expression: '#name, version',
-        expression_attribute_names: { "#name" => "name" },
-      ).items.map do |item|
+      fetch_all_items.map do |item|
         Item.new(name: item['name'], version: item['version'])
       end
     end
@@ -92,5 +77,52 @@ module CredStash::Repository
         },
       )
     end
+
+    private
+
+    def fetch_all_items
+      all_items = []
+      last_key = nil
+      loop do
+        response = @client.scan(
+          table_name: CredStash.config.table_name,
+          projection_expression: "#name, version",
+          expression_attribute_names: { "#name" => "name" },
+          exclusive_start_key: last_key
+        )
+
+        all_items += response.items
+
+        last_key = response.last_evaluated_key
+        break if last_key.nil?
+      end
+      all_items
+    end
+
+    def set_params(name, pluck: nil, limit: nil, version: nil)
+      params = {
+        table_name: CredStash.config.table_name,
+        consistent_read: true,
+        key_condition_expression: "#name = :name",
+        expression_attribute_names: { "#name" => "name" },
+        expression_attribute_values: { ":name" => name }
+      }
+      if pluck
+        params[:projection_expression] = pluck
+      end
+
+      if limit
+        params[:limit] = limit
+        params[:scan_index_forward] = false
+      end
+
+      if version
+        params[:key_condition_expression] = "#name = :name AND #version = :version"
+        params[:expression_attribute_names]["#version"] = "version"
+        params[:expression_attribute_values][":version"] = version
+      end
+
+      params
+    end
   end
 end

data/lib/cred_stash/secret.rb

@@ -29,8 +29,8 @@ class CredStash::Secret
   end
 
   class << self
-    def find(name, context: {})
-      item = repository.get(name)
+    def find(name, context: {}, version: nil)
+      item = repository.get(name, version: version)
       new(
         name: name,
         key: CredStash::CipherKey.decrypt(Base64.decode64(item.key), context: context),

data/lib/cred_stash/version.rb

@@ -1,3 +1,3 @@
 module CredStash
-  VERSION = "1.0.0"
+  VERSION = "1.1.0"
 end

data/lib/cred_stash.rb

@@ -1,7 +1,7 @@
 module CredStash
   class << self
-    def get(name, context: {}, raise_if_missing: false)
-      secret = Secret.find(name, context: context)
+    def get(name, context: {}, raise_if_missing: false, version: nil)
+      secret = Secret.find(name, context: context, version: version)
 
       if secret.falsified?
         raise "Invalid secret. #{name} has falsified"
@@ -24,10 +24,18 @@ module CredStash
       Repository.instance.list.inject({}) {|h, item| h[item.name] = item.version; h }
     end
 
-    def delete(name)
-      # TODO needs delete target version option
+    def list_with_version
+      Repository.instance.list.inject([]) do |h, item|
+        h.push({
+          "name" => item.name,
+          "version" => item.version
+        })
+      end
+    end
+
+    def delete(name, version: nil)
       repository = Repository.instance
-      item = repository.select(name).first
+      item = repository.select(name, version: version).first
       repository.delete(item)
     end
 

data/rcredstash.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'aws-sdk-dynamodb'
   spec.add_dependency 'thor'
 
-  spec.add_development_dependency "bundler", "~> 1.12"
+  spec.add_development_dependency "bundler", "~> 2.4"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rcredstash
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - adorechic
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2017-09-27 00:00:00.000000000 Z
+date: 2023-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-kms
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: '2.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: '2.4'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -128,7 +128,7 @@ homepage: https://github.com/adorechic/rcredstash
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -143,9 +143,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.13
-signing_key: 
+rubygems_version: 3.4.9
+signing_key:
 specification_version: 4
 summary: A Ruby port of CredStash
 test_files: []