onboardbase 1.1.5 → 1.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eb3792c0f98b5bd68400e31ad7e6ef47424b84797abe55db35308bc205cd952b
-  data.tar.gz: c8979f3db4748c205e58124077880ed271c0f29b9a86aa9f98bea708aac59df7
+  metadata.gz: 01b58322eb44c064087a101b20056e4916fa63fe369f09e94dac3ca40203417e
+  data.tar.gz: 642a4a3cc9115546d159465eb27b40671da23c711c3aeb235c0f17d5a2a83b7e
 SHA512:
-  metadata.gz: 41278e503ddc4dcd36aaef56143fbe5e1c846a629d9c7c677b1e9f263c98e15bb9abf7c2bc06413d3c520175a6ce661aec1edb7098005f8590e6e5d06a3f8428
-  data.tar.gz: 3a46da30f5c6ff9c37d6f12de6d1de3bb866f065e152eccfa6e6135644a87ec8951331a1c4f369f6d25cf184960d06a1651060da0749029dedb9ccc6cb8a0bc4
+  metadata.gz: 767d1d0b59851f369c64a9fd8e2d9935e5b1438b8895247221354c60d14a4387bbae5f284cbd95e840e8332db5e97d725c2b030fc520eb3f264f211473b35767
+  data.tar.gz: c21c4d07614ab227c6cc07f8b4df62e25b5fb212e48070de5aacc20cfaa97d54806a33dd198319a48d74f6ad733c6fc5fd26efdbde12e50bcf3e76f7baecbdbe

data/lib/onboardbase/version.rb

@@ -1,3 +1,3 @@
 module Onboardbase
-  VERSION = '1.1.5'
+  VERSION = '1.1.6'
 end

data/lib/onboardbase.rb

@@ -196,6 +196,12 @@ module Onboardbase
       secretsHash.keys.sort.each do |key|
         ENV["#{key}"] = "#{secretsHash[key]}"
       end
+
+      self.overrideWithLocal(ENV)
+      ENV.to_hash
+    end
+
+    def overrideWithLocal(secrets)
       # Overried local secrets
       configSecrets = self.configuration["secrets"]
       unless configSecrets
@@ -206,9 +212,9 @@ module Onboardbase
         localSecrets = {}
       end
       localSecrets.keys.sort.each do |key|
-        ENV["#{key}"] = "#{configSecrets["local"][key]}"
+        secrets["#{key}"] = "#{configSecrets["local"][key]}"
       end
-      ENV.to_hash
+      secrets
     end
 
     def hashSecrets?(secretsArr)
@@ -256,7 +262,8 @@ module Onboardbase
 
     def loadAsCredentials
       # Traditionally fetch secrets into ENV
-      self.loadSecrets
+      secrets = self.loadSecrets
+      # Load rails encryption module
       require "active_support/encrypted_configuration"
       credentials = ActiveSupport::EncryptedConfiguration.new(
           config_path: self.content_path,
@@ -265,13 +272,13 @@ module Onboardbase
           raise_if_missing_key: true
         )
 
-      secrets = YAML.load(credentials.read)
-      secrets.keys.sort.each do |key|
-        ENV["#{key}"] = "#{secrets[key]}"
+      encsecrets = YAML.load(credentials.read)
+      # secrets hash
+      encsecrets.keys.sort.each do |key|
+        secrets["#{key}"] = "#{encsecrets[key]}"
       end
-
-        # Append all environment variable
-      credentials.write(ENV.to_hash.to_yaml)
+      # Append all environment variable
+      credentials.write(secrets.to_yaml)
     end
 
     def loadSecrets
@@ -288,6 +295,7 @@ module Onboardbase
       end
       finalEnvs = self.setEnv(secrets)
       self.storeToFallback?(finalEnvs)
+      self.overrideWithLocal(secrets)
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: onboardbase
 version: !ruby/object:Gem::Version
-  version: 1.1.5
+  version: 1.1.6
 platform: ruby
 authors:
 - Onboardbase