onboardbase 1.1.3 → 1.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 858abb2f38c42e344f7c9bd375d500d330e66d34beb1a706156e3f1e13d4690b
-  data.tar.gz: 5b2964d639c8edf4aa4ff9aa0170afb98c246eb47cb5f2a19e465ce4caff58de
+  metadata.gz: 01b58322eb44c064087a101b20056e4916fa63fe369f09e94dac3ca40203417e
+  data.tar.gz: 642a4a3cc9115546d159465eb27b40671da23c711c3aeb235c0f17d5a2a83b7e
 SHA512:
-  metadata.gz: 14147aaa8869f220b31652b73375a621c0b16d1812bf80bc64bebb35e86d1f092c0e25a70ba41454fbf12fd7e7302122efba47c85baca5930fe79145ce038d24
-  data.tar.gz: 79e86cc473b634a4cc78e01b1c98ab817d3f91ce9ccdd42a9a776adb145d969663efe36c1753b62c2dd9d96679a6a89c40b49ce31cec70018383614438c1b355
+  metadata.gz: 767d1d0b59851f369c64a9fd8e2d9935e5b1438b8895247221354c60d14a4387bbae5f284cbd95e840e8332db5e97d725c2b030fc520eb3f264f211473b35767
+  data.tar.gz: c21c4d07614ab227c6cc07f8b4df62e25b5fb212e48070de5aacc20cfaa97d54806a33dd198319a48d74f6ad733c6fc5fd26efdbde12e50bcf3e76f7baecbdbe

data/lib/onboardbase/version.rb

@@ -1,3 +1,3 @@
 module Onboardbase
-  VERSION = '1.1.3'
+  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,14 +272,13 @@ module Onboardbase
           raise_if_missing_key: true
         )
 
-      if credentials.read do
-        secrets = YAML.load(credentials.read)
-        secrets.keys.sort.each do |key|
-          ENV["#{key}"] = "#{secrets[key]}"
-        end
+      encsecrets = YAML.load(credentials.read)
+      # secrets hash
+      encsecrets.keys.sort.each do |key|
+        secrets["#{key}"] = "#{encsecrets[key]}"
       end
-        # Append all environment values to the credentials
-      credentials.write(ENV.to_hash.to_yaml)
+      # Append all environment variable
+      credentials.write(secrets.to_yaml)
     end
 
     def loadSecrets
@@ -289,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.3
+  version: 1.1.6
 platform: ruby
 authors:
 - Onboardbase