samson_secret_puller 1.0.4 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5ec9cdb607bbae9e364fded2d14ba38099b99b2d
-  data.tar.gz: e65d94b641eb69bd2abdca7dc2486086e8bd4b58
+  metadata.gz: 51c888fa0b9252626544a64e036606bbdb3d199a
+  data.tar.gz: 0c5244ac03a2a9ed86c0ac66e277a0a9b708ac86
 SHA512:
-  metadata.gz: 63a4c4081a5ffdee3f12f0278ce226f21e3b49ee4e05bf4ef06ff382ab268afbbbaf2f4d90b50a2a6eff6b0c5d0148ae1b0f7dbfd3317486b0a370b4bc2dc2a4
-  data.tar.gz: 39261cf3683812b2b52cfc03a51b2554940f0de5eeae14a913b2e6813be8ef0a58094f4d6095b25c039653781d7129dc32cca7378f27d8fb16e2604e0de50b11
+  metadata.gz: fe78fb27da6431212caca45431265d937a8a085698453d5b2a902befe401346a1ac99ddec12ea401bc4fe43d508632577f4970c154b0c9ac7abc767fb56896d0
+  data.tar.gz: c156588e1ec7c22aaf8ccb1ff907e1850d4fdae074f25dfadd0c8d4a0c847a561a5fc21deef829714e0ac1b150d062ed142245313ca25b4b4f5d038143e00bea

data/lib/samson_secret_puller.rb

@@ -2,18 +2,14 @@ require 'forwardable'
 
 module SamsonSecretPuller
   FOLDER = '/secrets'.freeze
-  TIMEOUT = 60
-
-  class TimeoutError < StandardError
-  end
 
   ENV = ENV # store a copy since we might replace ENV on Object
 
   class << self
     extend Forwardable
     [
-      :[], :fetch, :keys, :each, :has_key?, :key?, :include?, :delete,
-      :each_with_object, :values_at, :reject, :select
+      :[], :fetch, :keys, :each, :has_key?, :key?, :include?,
+      :each_with_object, :values_at, :reject, :select, :to_a
     ].each do |method|
       def_delegator :secrets, method
     end
@@ -27,7 +23,22 @@ module SamsonSecretPuller
     end
 
     def []=(key, value)
-      ENV[key] = secrets[key] = value
+      if value.nil?
+        delete key
+      elsif secrets && @secret_keys.include?(key)
+        secrets[key] = value
+      else
+        ENV[key] = secrets[key] = value
+      end
+    end
+
+    def delete(key)
+      secrets.delete(key)
+      ENV.delete(key)
+    end
+
+    def replace(other)
+      (secrets.keys + other.keys).uniq.each { |k| self[k] = other[k] }
     end
 
     # When we run in kubernetes we need to read secrets from ENV and secret storage
@@ -44,17 +55,20 @@ module SamsonSecretPuller
 
     def secrets
       @secrets ||= begin
-        secrets = ENV.to_h
-        merge_secrets(secrets) if File.exist?(FOLDER)
-        secrets
+        combined = ENV.to_h
+        secrets = read_secrets
+        @secret_keys = secrets.keys
+        combined.merge!(secrets)
+        combined
       end
     end
 
-    def merge_secrets(secrets)
-      Dir.glob("#{FOLDER}/*").each do |file|
+    def read_secrets
+      return {} unless File.exist?(FOLDER)
+      Dir.glob("#{FOLDER}/*").each_with_object({}) do |file, all|
         name = File.basename(file)
         next if name.start_with?(".") # ignore .done and maybe others
-        secrets[name] = File.read(file).strip
+        all[name] = File.read(file).strip
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: samson_secret_puller
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.1.0
 platform: ruby
 authors:
 - Michael Grosser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-04 00:00:00.000000000 Z
+date: 2017-05-31 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: michael@grosser.it