secret_env 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6b6d038747e564094d9d1efb86fa4498304889b3
-  data.tar.gz: df4f21fbecfdc383face4429e049d31c9f126b54
+  metadata.gz: 7323742d6e6c066b4c0239a3149a548498d82fa1
+  data.tar.gz: 418b98c1383ebd67311dafe21232fe7e4069f6e5
 SHA512:
-  metadata.gz: af95c81e96ce289d6086f0e75c76df1debe74858c4a9ccb2d25ddaa7921ead9d80f81b34bfc710d5d9607c55c1eb02d645889c6e9c3d436aeac3682e126252f7
-  data.tar.gz: 76efe372b0cb71548992df198e474360667f98a9a42ebeb2bbed92714a3905986e1e71e325f58dde651139385c008aa1f95cf94ee21e8a6d6be80d2f586cadca
+  metadata.gz: b6c9cc0d8615845abcfef44eb754e50d086b84d1a8f80d91a75e563af0e58f2ec9ab2baa598ab149e3e29a7b2d2c06764d199d0ce4aefb9ae9386529d018cb11
+  data.tar.gz: ebb1ab0278300772720a5a9ec1538bbb316676971e6049d469dddbccaee8faea109e8467a500cc8055d5f50275291002d64d613ffee61f4d9f760648413d8221

data/lib/secret_env/storage.rb

@@ -0,0 +1,56 @@
+module SecretEnv
+  module Storage
+    class << self
+      def setup(config)
+        if config
+          klass(config.fetch('type')).new(namespace: config['namespace'])
+        else
+          Storage::Plain.new
+        end
+      end
+
+      private
+
+      def klass(type)
+        case type
+        when 'plain'
+          Storage::Plain
+        when 'credstash'
+          Storage::CredStash
+        else
+          raise "Unknown storage type: #{type}"
+        end
+      end
+    end
+
+    class Base
+      attr_reader :namespace
+
+      def initialize(namespace: '')
+        @namespace = namespace
+      end
+
+      def retrieve(secret_key)
+        raise NotImplemedError
+      end
+
+      private
+
+      def full_key(secret_key)
+        "#{namespace}#{secret_key}"
+      end
+    end
+
+    class Plain < Base
+      def retrieve(secret_key)
+        "#\{#{full_key(secret_key)}\}"
+      end
+    end
+
+    class CredStash < Base
+      def retrieve(secret_key)
+        ::CredStash.get(full_key(secret_key))
+      end
+    end
+  end
+end

data/lib/secret_env/version.rb

@@ -1,3 +1,3 @@
 module SecretEnv
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/lib/secret_env.rb

@@ -1,4 +1,5 @@
-require "secret_env/version"
+require 'secret_env/version'
+require 'secret_env/storage'
 require 'yaml'
 
 module SecretEnv
@@ -7,18 +8,7 @@ module SecretEnv
   def self.load(env: 'development')
     config = YAML.load_file(SECRETS_FILE).fetch(env)
 
-    storage = if config['storage']
-                case config['storage'].fetch('type')
-                when 'plain'
-                  Storage::Plain.new
-                when 'credstash'
-                  Storage::CredStash.new
-                else
-                  raise "Unknown storage type: #{config['storage']['type']}"
-                end
-              else
-                Storage::Plain.new
-              end
+    storage = Storage.setup(config['storage'])
 
     Array(config.fetch('env')).each do |key, raw_value|
       record = Record.new(key: key, raw_value: raw_value, storage: storage)
@@ -43,29 +33,10 @@ module SecretEnv
         secret = @storage.retrieve(secret_key)
         parts << part.gsub(scanner.matched, secret)
       end
+      parts << scanner.rest
       parts.join
     end
   end
-
-  module Storage
-    class Base
-      def retrieve(secret_key)
-        raise NotImplemedError
-      end
-    end
-
-    class Plain < Base
-      def retrieve(secret_key)
-        "#\{#{secret_key}\}"
-      end
-    end
-
-    class CredStash < Base
-      def retrieve(secret_key)
-        ::CredStash.get(secret_key)
-      end
-    end
-  end
 end
 
 require 'secret_env/rails' if defined?(Rails)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: secret_env
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - adorechic
@@ -86,6 +86,7 @@ files:
 - exe/secret_env
 - lib/secret_env.rb
 - lib/secret_env/rails.rb
+- lib/secret_env/storage.rb
 - lib/secret_env/version.rb
 - secret_env.gemspec
 homepage: